diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index ec2b23ff07b..0a5a759d0f7 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -292,15 +292,27 @@ class account_move_line(osv.osv):
         ml = self.browse(cr, uid, id, context)
         return map(lambda x: x.id, ml.move_id.line_id)
 
-    # TODO: this is false, it does not uses draft and closed periods
-    def _balance(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res={}
-        # TODO group the foreach in sql
-        for id in ids:
-            cr.execute('SELECT date,account_id FROM account_move_line WHERE id=%s', (id,))
-            dt, acc = cr.fetchone()
-            cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE account_id=%s AND (date<%s OR (date=%s AND id<=%s))', (acc,dt,dt,id))
-            res[id] = cr.fetchone()[0]
+    def _balance(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+
+        c = context.copy()
+        c['initital_bal'] = True
+
+        sql = [
+            """select l2.id, sum(l1.debit-l1.credit) from account_move_line l1, account_move_line l2""",
+            """where l2.account_id=l1.account_id""",
+            """and""",
+            """l1.id<=l2.id""",
+            """and""",
+            """l2.id in %s""",
+            """and""",
+            self._query_get(cr, uid, obj='l1', context=c),
+            """ group by l2.id""",
+        ]
+
+        cr.execute('\n'.join(sql), [tuple(ids)])
+        res = dict(cr.fetchall())
         return res
 
     def _invoice(self, cursor, user, ids, name, arg, context=None):
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 3312a5bbe38..39d7454344b 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-30 13:07+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-01 11:48+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-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index 223258c73fa..c955e868340 100644
--- a/addons/account_anglo_saxon/i18n/nl.po
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-09-30 13:20+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-01 11:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_coda/i18n/nl.po b/addons/account_coda/i18n/nl.po
index 8a54707bf2d..ca39ba7fc79 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/account_coda/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-10-01 06:44+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-01 11:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/analytic/i18n/nl.po b/addons/analytic/i18n/nl.po
index 24849b0b713..fbb8b85789d 100644
--- a/addons/analytic/i18n/nl.po
+++ b/addons/analytic/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-10-01 07:53+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-01 11:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index 21385e6b602..6d6bc8f3d25 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-10-01 08:47+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-02 08:12+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-01 08:48+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -185,42 +185,42 @@ msgstr "Laatste actiedatum"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Uren"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_id)s = Object ID"
-msgstr ""
+msgstr "%(object_id)s = Object ID"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Delay After Trigger Date"
-msgstr ""
+msgstr "Vertraging na Activeerdatum"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr ""
+msgstr "Herinneren met bijlage"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ongeldige argumenten"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible to"
-msgstr ""
+msgstr "Zet verantwoordelijke op"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(object_user_phone)s = Telefoon verantwoordelijke"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -228,11 +228,14 @@ msgid ""
 "The rule uses the AND operator. The model must match all non-empty fields so "
 "that the rule executes the action described in the 'Actions' tab."
 msgstr ""
+"De regel gebruikt een EN bewerking. Het model moet met alle niet-lege velden "
+"overeenkomen om de regel de in de 'Acties' tab beschreven actie te laten "
+"uitvoeren."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Soort vertraging"
 
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
@@ -242,11 +245,15 @@ msgid ""
 "string 'urgent'\n"
 "Note: This is case sensitive search."
 msgstr ""
+"Reguliere expressie voor overeenkomende naam van de bron; \n"
+"i.e.: 'urgent.*' zal zoeken naar records met de naam beginnend met de tekst "
+"'urgent'\n"
+"Opmerking: dit zoeken is hoofdletter gevoelig."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Object-methode aanroepen"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
@@ -254,31 +261,33 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Vink aan als u wilt dat de regel CC markeert (mail naar een andere in de "
+"acties gedefinieerde persoon)."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)s = Naam relatie"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Notitie"
 
 #. module: base_action_rule
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Vertraging na activeerdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Voorwaarden"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -287,47 +296,50 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Vertraging na activeerdatum, specificeert dat u een negatief getal kunt "
+"invoeren als u vertraging vóór de activeerdatum wilt, zoals een herinnering "
+"15 minuten voor een vergadering versturen."
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Geen email-ID gevonden bij uw bedrijfsadres!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
 msgid "Remind Responsible"
-msgstr ""
+msgstr "Herinneren verantwoordelijke"
 
 #. module: base_action_rule
 #: model:ir.module.module,description:base_action_rule.module_meta_information
 msgid "This module allows to implement action rules for any object."
-msgstr ""
+msgstr "Deze module laat u actieregels voor elk object implementeren."
 
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
-msgstr ""
+msgstr "Geeft de volgorde aan waarin de lijst van regels wordt weergegeven."
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Maanden"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: base_action_rule
 #: help:base.action.rule,server_action_id:0
@@ -335,108 +347,111 @@ msgid ""
 "Describes the action name.\n"
 "eg:on which object which action to be taken on basis of which condition"
 msgstr ""
+"Beschrijft de actie naam.\n"
+"ie: op welk object welke actie wordt uitgevoerd onder welke conditie"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.cron"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_description)s = Object description"
-msgstr ""
+msgstr "%(object_description)s = Object omschrijving"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Actions"
-msgstr ""
+msgstr "Email acties"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
-msgstr ""
+msgstr "Email Informatie"
 
 #. module: base_action_rule
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Actieregels"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Inhoud van mail"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner_email)s = Partner Email"
-msgstr ""
+msgstr "%(partner_email)s = Relatie email"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_date)s = Creation date"
-msgstr ""
+msgstr "%(object_date)s = Aanmaakdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_email)s = Responsible Email"
-msgstr ""
+msgstr "%(object_user_email)s = Verantwoordelijke email"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "E-mail berichttekst"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "E-mail naar toeschouwers (CC)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Server actie om te activeren"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_user:0
 msgid "Mail to Responsible"
-msgstr ""
+msgstr "E-mail naar verantwoordelijke"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_cc:0
 msgid "Add Watchers (Cc)"
-msgstr ""
+msgstr "Toevoegen toeschouwers (Cc)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Fields"
-msgstr ""
+msgstr "Voorwaarden op Model velden"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
 #: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
 msgid "Automated Actions"
-msgstr ""
+msgstr "Geautomatiseerde acties"
 
 #. module: base_action_rule
 #: field:base.action.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Server-actie"
 
 #. module: base_action_rule
 #: field:base.action.rule,regex_name:0
 msgid "Regex on Resource Name"
-msgstr ""
+msgstr "Regex op bronnaam"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_attach:0
@@ -444,21 +459,23 @@ msgid ""
 "Check this if you want that all documents attached to the object be attached "
 "to the reminder email sent."
 msgstr ""
+"Vink dit aan als u wilt dat alle bij het object gevoegde documenten worden "
+"bijgevoegd bij de verstuurde herinnering."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Timing"
-msgstr ""
+msgstr "Voorwaarden op timing"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgnummer"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -466,23 +483,25 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the rule "
 "without removing it."
 msgstr ""
+"Als het actief veld uitzet, kunt u de regel verbergen zonder haar te "
+"verwijderen."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user)s = Responsible name"
-msgstr ""
+msgstr "%(object_user)s = Naam verantwoordelijke"
 
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on States"
-msgstr ""
+msgstr "Voorwaarden op status"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Activeerdatum"
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5ccfbdb23d8..b71e2daa447 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -673,9 +673,10 @@ true, it will allow you to hide the event alarm information without removing it.
                     new_res_alarm = res_alarm_obj.create(cr, uid, val, context=context)
                 else:
                     new_res_alarm = alarm_ids[0]
-                cr.execute('Update %s set base_calendar_alarm_id=%s, alarm_id=%s \
-                                    where id=%s' % (model_obj._table, \
-                                    cal_alarm.id, new_res_alarm, data.id))
+                cr.execute('UPDATE %s ' % model_obj._table + \
+                            ' SET base_calendar_alarm_id=%s, alarm_id=%s ' \
+                            ' WHERE id=%s', 
+                            (cal_alarm.id, new_res_alarm, data.id))
 
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
@@ -697,9 +698,10 @@ true, it will allow you to hide the event alarm information without removing it.
                     'user_id': uid
                  }
                 alarm_id = alarm_obj.create(cr, uid, vals)
-                cr.execute('Update %s set base_calendar_alarm_id=%s, alarm_id=%s \
-                                        where id=%s' % (model_obj._table, \
-                                        alarm_id, basic_alarm.id, data.id))
+                cr.execute('UPDATE %s ' % model_obj._table + \
+                            ' SET base_calendar_alarm_id=%s, alarm_id=%s '
+                            ' WHERE id=%s', \
+                            ( alarm_id, basic_alarm.id, data.id) )
         return True
 
     def do_alarm_unlink(self, cr, uid, ids, model, context=None):
@@ -722,7 +724,7 @@ true, it will allow you to hide the event alarm information without removing it.
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
                 cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
-                            where id=%s' % (model_obj._table, datas.id))
+                            where id=%%d' % model_obj._table,(datas.id,))
         return True
 
 res_alarm()
@@ -994,10 +996,10 @@ class calendar_event(osv.osv):
             context = {}
         cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
-                    day=0,select1='date',month_list=Null ,byday=Null where id=%s" % (self._table, id))
+                    day=0,select1='date',month_list=Null ,byday=Null where id=%%s" % (self._table), (id,))
 
         if not value:
-            cr.execute("UPDATE %s set rrule_type='none' where id=%s" % (self._table, id))
+            cr.execute("UPDATE %s set rrule_type='none' where id=%%s" % self._table,(id,))
             return True
         val = {}
         for part in value.split(';'):
@@ -1063,7 +1065,7 @@ class calendar_event(osv.osv):
             'rule_type': rrule_type,
             'id': id,
         })
-        cr.execute(qry % val)
+        cr.execute(qry, val) # Hopefully psycopg2 works with dicts. But, FIXME
         return True
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
@@ -1081,7 +1083,7 @@ class calendar_event(osv.osv):
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
-                    cr.execute("UPDATE %s set exrule=Null where id=%s" % (self._table, event))
+                    cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,))
                 elif datas.get('rrule_type') == 'custom':
                     if datas.get('interval', 0) < 0:
                         raise osv.except_osv('Warning!', 'Interval can not be Negative')
@@ -1258,7 +1260,7 @@ true, it will allow you to hide the event alarm information without removing it.
             if defaults.get('location'):
                 qry += ", location = '%(location)s'"
             qry += "WHERE id = %s" % (event_id)
-            cr.execute(qry %(defaults))
+            cr.execute(qry, defaults)
 
         return True
 
@@ -1283,8 +1285,7 @@ true, it will allow you to hide the event alarm information without removing it.
         if ids and (base_start_date or base_until_date):
             cr.execute("select m.id, m.rrule, m.date, m.date_deadline, m.duration, \
                             m.exdate, m.exrule, m.recurrent_id, m.recurrent_uid from " + self._table + \
-                            " m where m.id in ("\
-                            + ','.join(map(lambda x: str(x), ids))+")")
+                            " m where m.id = ANY(%s)", (ids,) )
 
             count = 0
             for data in cr.dictfetchall():
@@ -1683,10 +1684,8 @@ class calendar_todo(osv.osv):
         @param context: A standard dictionary for contextual values
         """
 
-        event = self.browse(cr, uid, id, context=context)
-        cr.execute("UPDATE %s set date_start='%s' where id=%s" \
-                            % (self._table, value, id))
-        return True
+        assert name == 'date'
+        return self.write(cr, uid, id, { 'date_start': value }, context=context)
 
     _columns = {
         'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index c3292452298..2a0ed14080f 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -122,7 +122,7 @@
                        separator="1" help="Delegated Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
-                   <field name="user_id" select="1"/>
+                   <field name="user_id" select="1" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 98369962ab7..47f5681addf 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -159,8 +159,8 @@ send an Email to Invited Person')
 
         if not partner_id:
             return {'value': {'contact_ids': []}}
-        cr.execute('select id from res_partner_address \
-                         where partner_id=%s' % (partner_id))
+        cr.execute('SELECT id FROM res_partner_address \
+                         WHERE partner_id=%s', (partner_id,))
         contacts = map(lambda x: x[0], cr.fetchall())
         return {'value': {'contact_ids': contacts}}
 
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 8752a573725..ad438c710b4 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -143,34 +143,9 @@
 
     <menuitem
         name="Custom Reports" id="base.menu_custom_reports"
-        groups="base.group_extended"
         action="base_report_creator_action" parent="base.reporting_menu" sequence="1"/>
 
-    <menuitem
-        parent="base.next_id_50"
-        id="menu_base_report_creator_action_config"
-        action="base_report_creator_action"/>
-
-    <record model="ir.ui.view" id="base_report_creator_tree_simple">
-        <field name="name">base_report_creator.report.simple.tree</field>
-        <field name="model">base_report_creator.report</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Reports">
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="base_report_creator_action_tree">
-        <field name="res_model">base_report_creator.report</field>
-        <field name="view_type">tree</field>
-    </record>
-
-    <menuitem
-        name="Custom Reports" parent="base.menu_custom_reports"
-        id="menu_base_report_creator_action"
-        action="base_report_creator_action_tree"/>
+    
 
     </data>
 </openerp>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 21537d3d63c..4ea4970d19a 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -72,21 +72,10 @@
       <field name="context">{'menu':True}</field> 
     </record>
 
-    
-    <menuitem icon="terp-graph" id="base.reporting_menu"
-            name="Reporting" sequence="30" />
-
-    <menuitem id="base.next_id_50" name="Configuration"
-        parent="base.reporting_menu"  sequence="3" />
-
-    <menuitem parent="base.next_id_50" name="Report Designer"
+    <menuitem parent="base.reporting_menu" name="Report Designer"
         action="action_report_designer_wizard"
         id="menu_action_report_designer_wizard" sequence="70" />
 
-   <menuitem parent="base.next_id_50" name="Modify an existing report"
-            action="action_view_base_report_sxw"
-            id="menu_wizard_report_designer_modify" sequence="70" groups="base.group_extended"/>
-
   </data>
 </openerp>
 
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 80680b6615e..59598f6577a 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -60,25 +60,15 @@ class base_setup_config_choice(osv.osv_memory):
          'config_logo' : _get_image
         }
 
-    def set_default_menu(self, cr, uid, menu, context=None):
-        user = self.pool.get('res.users')\
-                        .browse(cr, uid, uid, context=context)
-
-        user.write({'action_id': menu.id,
-                    'menu_id': menu.id})
-
-    def get_default_menu(self, cr, uid, context=None):
-        actions = self.pool.get('ir.actions.act_window')
-
-        current_menu_id = actions.search(cr, uid, [('name','=','Menu')],
-                                         context=context)
-        assert len(current_menu_id) == 1,\
-               'A given user should only have one menu item'
-        return actions.browse(cr, uid, current_menu_id[0], context=context)
+    def reset_menu(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        menu_id = user._get_menu()
+        user.write({'action_id': False,
+                    'menu_id': menu_id})
+        return self.pool.get('ir.actions.act_window').browse(cr, uid, menu_id, context=context)
 
     def menu(self, cr, uid, ids, context=None):
-        menu = self.get_default_menu(cr, uid, context=context)
-        self.set_default_menu(cr, uid, menu, context=context)
+        menu = self.reset_menu(cr, uid, context=context)
 
         if menu.view_id.id:
             view_id = (menu.view_id.id, menu.view_id.name)
@@ -98,9 +88,7 @@ class base_setup_config_choice(osv.osv_memory):
         }
 
     def config(self, cr, uid, ids, context=None):
-        menu = self.get_default_menu(cr, uid, context=context)
-        self.set_default_menu(cr, uid, menu, context=context)
-
+        self.reset_menu(cr, uid, context=context)
         return self.pool.get('res.config').next(cr, uid, [], context=context)
 
 base_setup_config_choice()
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index 69fcb839715..bd285821e2b 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -24,9 +24,12 @@
         "version":"0.1",
         "author":"Tiny",
         "category":"Generic Modules/Base",
+        "description": """Synchronization with all objects.""",
         "depends":["base"],
         "demo_xml":[],
-        "update_xml":["base_synchro_wizard.xml","base_synchro_view.xml"],
+        "update_xml":[ "wizard/base_synchro_view.xml",
+                      "base_synchro_view.xml",
+                       "security/ir.model.access.csv",],
         "active":False,
         "installable":True,
 }
diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py
index 5093c8f787e..64fad4cd687 100755
--- a/addons/base_synchro/base_synchro_obj.py
+++ b/addons/base_synchro/base_synchro_obj.py
@@ -42,7 +42,7 @@ class base_synchro_server(osv.osv):
 base_synchro_server()
 
 class base_synchro_obj(osv.osv):
-    '''Class to store the operations done by wizart'''
+    '''Class to store the operations done by wizard'''
     _name = "base.synchro.obj"
     _description = "Register Class"
     _columns = {
@@ -66,6 +66,10 @@ class base_synchro_obj(osv.osv):
     #
     # Return a list of changes: [ (date, id) ]
     #
+
+    def get_ids(self, cr, uid, object, dt, domain=[], context={}):
+        return self._get_ids(cr, uid, object, dt, domain, context)
+
     def _get_ids(self, cr, uid, object, dt, domain=[], context={}):
         result = []
         if dt:
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index 97995106070..e35a43837fa 100755
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -30,6 +30,37 @@
             </field>
         </record>
 
+        <record id="ir_filters_transfer_line_form" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.form</field>
+            <field name="model">base.synchro.obj.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Transfered Ids Details">
+                    <group colspan="4" col="10">
+                      <field name="name"/>
+                      <field name="obj_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By" colspan="4">
+                      <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'obj_id'}"/>
+                      <separator orientation="vertical"/>
+                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'name'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!--        Filters action-->
+
+        <record id="actions_transfer_line_form" model="ir.actions.act_window">
+            <field name="name">Filters</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_transfer_line_tree"/>
+            <field name="search_view_id" ref="ir_filters_transfer_line_form"/>
+        </record>
+
 
         <record id="action_base_synchro_obj_line_tree" model="ir.actions.act_window">
             <field name="name">Synchronized instances</field>
@@ -56,7 +87,7 @@
                     <field colspan="4" name="domain"/>
                     <field name="synchronize_date"/>
                     <newline/>
-                    <field name="avoid_ids" colspan="4">
+                    <field name="avoid_ids" colspan="4" nolabel="1">
                         <tree string="Fields" editable="bottom">
                             <field name="name"/>
                         </tree>
@@ -81,6 +112,37 @@
             </field>
         </record>
 
+        <record id="ir_filters_regclass_tree" model="ir.ui.view">
+            <field name="name">base.synchro.obj.line.form</field>
+            <field name="model">base.synchro.obj</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Synchronized objects">
+                    <group colspan="4" col="10">
+                      <field name="model_id"/>
+                      <field name="synchronize_date"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By" colspan="4">
+                      <filter string="Object to synchronize" icon="terp-stage" domain="[]" context="{'group_by':'model_id'}"/>
+                      <separator orientation="vertical"/>
+                      <filter string="Latest synchronization" icon="terp-go-month" domain="[]" context="{'group_by':'synchronize_date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!--        Filters action-->
+
+        <record id="actions_regclass_tree" model="ir.actions.act_window">
+            <field name="name">Filters</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro.obj</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_regclass_tree"/>
+            <field name="search_view_id" ref="ir_filters_regclass_tree"/>
+        </record>
+
         <record id="action_transfer_tree" model="ir.actions.act_window">
             <field name="name">Synchronized objects</field>
             <field name="type">ir.actions.act_window</field>
@@ -115,15 +177,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Synchronized server">
-                    <field name="name" select="1"/>
-                    <newline/>
-                    <field name="server_url" select="2"/>
-                    <newline/>
-                    <field name="server_port"/>
-                    <field name="server_db"/>
-                    <newline/>
-                    <field name="login" select="1"/>
-                    <field name="password"/>
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="login"/>
+                        <field name="password" password="True"/>
+                        <field name="server_url"/>
+                        <field name="server_port"/>
+                        <field name="server_db"/>
+                    </group>
+                    
                 </form>
             </field>
         </record>
diff --git a/addons/base_synchro/base_synchro_wizard.xml b/addons/base_synchro/base_synchro_wizard.xml
deleted file mode 100644
index b26b3bbae2b..00000000000
--- a/addons/base_synchro/base_synchro_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard id="wizard_cost_account_synchro" model="account.analytic.account" name="account.analytic.account.transfer" string="Synchronize objects"/>
-		<menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/><menuitem action="wizard_cost_account_synchro" id="menu_wizard_cost_account_synchro" parent="base_synchro.next_id_62" type="wizard"/>
-
-	</data>
-</openerp>
diff --git a/addons/base_synchro/security/ir.model.access.csv b/addons/base_synchro/security/ir.model.access.csv
new file mode 100644
index 00000000000..fa0f00e8ccd
--- /dev/null
+++ b/addons/base_synchro/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"base_synchro_server","base.synchro.server","model_base_synchro_server","base.group_system",1,1,1,1
+" base_synchro_obj"," base.synchro.obj","model_base_synchro_obj","base.group_system",1,1,1,1
+"base_synchro_obj_avoid","base.synchro.obj.avoid","model_base_synchro_obj_avoid","base.group_system",1,1,1,1
+"base_synchro_obj_line","base.synchro.obj.line","model_base_synchro_obj_line","base.group_system",1,1,1,1
diff --git a/addons/base_synchro/wizard/__init__.py b/addons/base_synchro/wizard/__init__.py
index 7ff450acd76..3deff83f9e3 100644
--- a/addons/base_synchro/wizard/__init__.py
+++ b/addons/base_synchro/wizard/__init__.py
@@ -19,4 +19,5 @@
 #
 ##############################################################################
 import base_synchro
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
index 3a394d4ba3b..c83ec7df0e9 100644
--- a/addons/base_synchro/wizard/base_synchro.py
+++ b/addons/base_synchro/wizard/base_synchro.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+## -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
 import osv
 from datetime import date
 import time
@@ -27,26 +26,7 @@ import xmlrpclib
 import re
 import tools
 import threading
-
-acc_synchro_form = '''<?xml version="1.0"?>
-<form string="Transfer Data To Server">
-    <field name="server_url" colspan="4"/>
-    <newline/>
-    <separator string="Control" colspan="4"/>
-    <field name="user_id"/>
-    <newline/>
-</form>'''
-
-acc_synchro_fields = {
-    'server_url': {'string':'Server URL', 'type':'many2one', 'relation':'base.synchro.server','required':True},
-    'user_id': {'string':'Send Result To', 'type':'many2one', 'relation':'res.users', 'default': lambda uid,data,state: uid},
-}
-
-finish_form ='''<?xml version="1.0"?>
-<form string="Synchronization Complited!">
-    <label string="The synchronisation has been started.\nYou will receive a request when it's done." colspan="4"/>
-</form>
-'''
+from osv import osv, fields
 
 class RPCProxyOne(object):
     def __init__(self, server, ressource):
@@ -66,13 +46,26 @@ class RPCProxy(object):
     def get(self, ressource):
         return RPCProxyOne(self.server, ressource)
 
-class wizard_cost_account_synchro(wizard.interface):
+class base_synchro(osv.osv_memory):
+    """Base Synchronization """
+    _name = 'base.synchro'
+
+    _columns = {
+    'server_url': fields.many2one('base.synchro.server', "Server URL", required=True),
+    'user_id': fields.many2one('res.users', "Send Result To",),
+    }
+
+    _defaults = {
+        'user_id': lambda self,cr,uid,context: uid,
+        }
+
     start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
     report = []
     report_total = 0
     report_create = 0
     report_write = 0
-    def _synchronize(self, cr, uid, server, object, context):
+
+    def synchronize(self, cr, uid, server, object, context):
         pool = pooler.get_pool(cr.dbname)
         self.meta = {}
         ids = []
@@ -80,14 +73,14 @@ class wizard_cost_account_synchro(wizard.interface):
         pool2 = pool
         #try:
         if object.action in ('d','b'):
-            ids = pool1.get('base.synchro.obj')._get_ids(cr, uid,
+            ids = pool1.get('base.synchro.obj').get_ids(cr, uid,
                 object.model_id.model,
                 object.synchronize_date,
                 eval(object.domain),
                 {'action':'d'}
             )
         if object.action in ('u','b'):
-            ids += pool2.get('base.synchro.obj')._get_ids(cr, uid,
+            ids += pool2.get('base.synchro.obj').get_ids(cr, uid,
                 object.model_id.model,
                 object.synchronize_date,
                 eval(object.domain),
@@ -109,7 +102,7 @@ class wizard_cost_account_synchro(wizard.interface):
             if object.model_id.model=='crm.case.history':
                 fields = ['email','description','log_id']
             value = pool_src.get(object.model_id.model).read(cr, uid, [id], fields)[0]
-            value = self._data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
+            value = self.data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
             id2 = self.get_id(cr, uid, object.id, id, action, context)
             #
             # Transform value
@@ -133,7 +126,7 @@ class wizard_cost_account_synchro(wizard.interface):
             else:
                 print value
                 idnew = pool_dest.get(object.model_id.model).create(cr, uid, value)
-                synid = pool.get('base.synchro.obj.line').create(cr, uid, {
+                synid = self.pool.get('base.synchro.obj.line').create(cr, uid, {
                     'obj_id': object.id,
                     'local_id': (action=='u') and id or idnew,
                     'remote_id': (action=='d') and id or idnew
@@ -141,25 +134,20 @@ class wizard_cost_account_synchro(wizard.interface):
                 self.report_total+=1
                 self.report_create+=1
         self.meta = {}
-        return 'finish'
+        return True
 
-    #
-    # IN: object and ID
-    # OUT: ID of the remote object computed:
-    #        If object is synchronised, read the sync database
-    #        Otherwise, use the name_search method
-    #
     def get_id(self, cr, uid, object_id, id, action, context={}):
         pool = pooler.get_pool(cr.dbname)
+        line_pool = pool.get('base.synchro.obj.line')
         field_src = (action=='u') and 'local_id' or 'remote_id'
         field_dest = (action=='d') and 'local_id' or 'remote_id'
-        rid = pool.get('base.synchro.obj.line').search(cr, uid, [('obj_id','=',object_id), (field_src,'=',id)], context=context)
+        rid = line_pool.search(cr, uid, [('obj_id','=',object_id), (field_src,'=',id)], context=context)
         result = False
         if rid:
-            result  = pool.get('base.synchro.obj.line').read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
+            result  = line_pool.read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
         return result
 
-    def _relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
+    def relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
         if not id:
             return False
         pool = pooler.get_pool(cr.dbname)
@@ -186,7 +174,14 @@ class wizard_cost_account_synchro(wizard.interface):
                 print self.report.append('WARNING: Record "%s" on relation %s not found, set to null.' % (names,object))
         return result
 
-    def _data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
+    #
+    # IN: object and ID
+    # OUT: ID of the remote object computed:
+    #        If object is synchronised, read the sync database
+    #        Otherwise, use the name_search method
+    #
+
+    def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
         self.meta.setdefault(pool_src, {})
         if not object in self.meta[pool_src]:
             self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context)
@@ -201,12 +196,12 @@ class wizard_cost_account_synchro(wizard.interface):
                 del data[f]
             elif ftype == 'many2one':
                 if data[f]:
-                    df = self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
+                    df = self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
                     data[f] = df
                     if not data[f]:
                         del data[f]
             elif ftype == 'many2many':
-                res = map(lambda x: self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], x, action, context), data[f])
+                res = map(lambda x: self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], x, action, context), data[f])
                 data[f] = [(6, 0, res)]
         del data['id']
         return data
@@ -215,21 +210,22 @@ class wizard_cost_account_synchro(wizard.interface):
     # Find all objects that are created or modified after the synchronize_date
     # Synchronize these obejcts
     #
-    def _upload_download(self, db_name, uid, data, context):
-        cr = pooler.get_db(db_name).cursor()
+
+
+    def upload_download(self, cr, uid, ids, context):
         start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+        syn_obj = self.browse(cr, uid, ids)[0]
         pool = pooler.get_pool(cr.dbname)
-        server = pool.get('base.synchro.server').browse(cr, uid, data['form']['server_url'], context)
+        server = pool.get('base.synchro.server').browse(cr, uid, ids, context)[0]
         for object in server.obj_ids:
             dt = time.strftime('%Y-%m-%d %H:%M:%S')
-            self._synchronize(cr, uid, server, object, context)
+            self.synchronize(cr, uid, server, object, context)
             if object.action=='b':
                 time.sleep(1)
                 dt = time.strftime('%Y-%m-%d %H:%M:%S')
-            pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
-            cr.commit()
+            self.pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
         end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
-        if 'user_id' in data['form'] and data['form']['user_id']:
+        if 'user_id' in syn_obj.user_id:
             request = pooler.get_pool(cr.dbname).get('res.request')
             if not self.report:
                 self.report.append('No exception.')
@@ -248,32 +244,26 @@ Exceptions:
             request.create(cr, uid, {
                 'name' : "Synchronization report",
                 'act_from' : uid,
-                'act_to' : data['form']['user_id'],
+                'act_to' : syn_obj.user_id,
                 'body': summary,
             })
-        cr.commit()
-        cr.close()
-        return 'finish'
+            return True
 
-    def _upload_download_multi_thread(self, cr, uid, data, context):
-        threaded_synchronization = threading.Thread(target=self._upload_download, args=(cr.dbname, uid, data, context))
-        threaded_synchronization.start()
-        return 'finish'
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':acc_synchro_form, 'fields':acc_synchro_fields, 'state':[('end','Cancel'),('upload_download','Synchronize')]}
-        },
-        'upload_download': {
-            'actions': [],
-            'result':{'type':'choice', 'next_state': _upload_download_multi_thread}
-        },
-        'finish': {
-            'actions': [],
-            'result':{'type':'form', 'arch':finish_form,'fields':{},'state':[('end','Ok')]}
-        },
-    }
-wizard_cost_account_synchro('account.analytic.account.transfer')
+    def upload_download_multi_thread(self, cr, uid, data, context):
+        threaded_synchronization = threading.Thread(target=self.upload_download, args=(cr, uid, data, context))
+        threaded_synchronization.run()
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'base_synchro', 'view_base_synchro_finish')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'base.synchro',
+            'views': [(id2, 'form')],
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+base_synchro()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
new file mode 100644
index 00000000000..291e2c4385e
--- /dev/null
+++ b/addons/base_synchro/wizard/base_synchro_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+
+        <record id="view_base_synchro" model="ir.ui.view">
+            <field name="name">Base Synchronization</field>
+            <field name="model">base.synchro</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Transfer Data To Server">
+                <field name="server_url" colspan="4"/>
+                <field name="user_id" default="uid"/>
+                <newline/>
+                <separator string="" colspan="4"/>
+                <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                <button name="upload_download_multi_thread" string="_Synchronize" type="object" icon="gtk-ok"/>
+            </form>
+            </field>
+       </record>
+
+        <record id="action_view_base_synchro" model="ir.actions.act_window">
+            <field name="name">Base Synchronization</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.synchro</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
+        <record id="view_base_synchro_finish" model="ir.ui.view">
+            <field name="name">Base Synchronization</field>
+            <field name="model">base.synchro</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Synchronization Complited!">
+            <label string="The synchronisation has been started.You will receive a request when it's done." colspan="4"/>
+                 <separator string="" colspan="4"/>
+                    <button special="cancel" string="OK" icon="gtk-ok"/>
+            </form>
+            </field>
+       </record>
+
+        <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
+
+        <menuitem parent="base_synchro.next_id_62" name="Synchronize objects"
+            action="action_view_base_synchro"
+            id="menu_action_view_base_synchro" />
+    </data>
+</openerp>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 984a17caa51..d48ddd6a025 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="base.reporting_menu"
-            parent="base.menu_custom"
-            name="Reporting" sequence="30" />
 <!--Board Note Search View  -->
         <record id="view_board_note_search" model="ir.ui.view">
             <field name="name">board.note.search</field>
@@ -23,7 +20,7 @@
                 </search>
             </field>
         </record>
-        
+
 <!--Board Note Tree View  -->
 
         <record id="view_board_note_tree" model="ir.ui.view">
@@ -33,11 +30,11 @@
             <field name="arch" type="xml">
                 <tree string="Notes">
                     <field name="name"/>
-                    <field name="user_id"/>                    
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
-        
+
 <!--Board Note Form View  -->
 
         <record id="view_board_note_form" model="ir.ui.view">
@@ -113,7 +110,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_board_search" model="ir.ui.view">
             <field name="name">board.board.search</field>
             <field name="model">board.board</field>
@@ -136,19 +133,13 @@
             <field name="search_view_id" ref="view_board_search"/>
         </record>
 
-        <menuitem
-            id="base.next_id_50"
-            name="Configuration"
-            parent="base.reporting_menu"
-            groups="base.group_system"
-            sequence="3"/>
         <menuitem
             action="action_view_board_list_form"
-            id="menu_view_board_form"
-            parent="base.next_id_50" sequence="1"/>
+            id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
 
         <menuitem action="action_view_board_note_form"
-            id="menu_view_board_note_form" parent="base.next_id_50"
+            id="menu_view_board_note_form"
+            parent="base.reporting_menu"
             sequence="3" groups="base.group_system" />
 
         <act_window context="{'view': active_id}" id="dashboard_open"
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 88b0549a3de..bcc624d6a67 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -61,10 +61,10 @@ def uid2openobjectid(cr, uidval, oomodel, rdate):
         model_obj = pooler.get_pool(cr.dbname).get(model)
         if (not model == oomodel) or (not dbname == cr.dbname):
             return (False, None)
-        qry = 'select distinct(id) from %s' % model_obj._table
+        qry = 'SELECT DISTINCT(id) FROM %s' % model_obj._table
         if rdate:
-            qry += " where recurrent_id='%s'" % (rdate)
-            cr.execute(qry)
+            qry += " WHERE recurrent_id=%s"
+            cr.execute(qry, (rdate,))
             r_id = cr.fetchone()
             if r_id:
                 return (id, r_id[0])
@@ -364,8 +364,8 @@ class CalDAV(object):
                         model_obj = self.pool.get(model)
                         r_ids = []
                         if model_obj._columns.get('recurrent_uid', None):
-                            cr.execute('select id from %s  where recurrent_uid=%s'
-                                           % (model_obj._table, data[map_field]))
+                            cr.execute('SELECT id FROM %s WHERE recurrent_uid=%%s' % model_obj._table,
+                                        (data[map_field],))
                             r_ids = map(lambda x: x[0], cr.fetchall())
                         if r_ids:
                             r_datas = model_obj.read(cr, uid, r_ids, context=context)
@@ -715,8 +715,9 @@ class basic_calendar_line(osv.osv):
             @param context: A standard dictionary for contextual values
         """
 
-        cr.execute("Select count(id) from basic_calendar_lines \
-                                where name='%s' and calendar_id=%s" % (vals.get('name'), vals.get('calendar_id')))
+        cr.execute("SELECT COUNT(id) FROM basic_calendar_lines \
+                                WHERE name='%s' AND calendar_id=%s", 
+                                (vals.get('name'), vals.get('calendar_id')))
         res = cr.fetchone()
         if res:
             if res[0] > 0:
@@ -797,8 +798,8 @@ class basic_calendar_fields(osv.osv):
             @param context: A standard dictionary for contextual values
         """
 
-        cr.execute('select name from basic_calendar_attributes \
-                            where id=%s' % (vals.get('name')))
+        cr.execute('SELECT name FROM basic_calendar_attributes \
+                            WHERE id=%s', (vals.get('name'),))
         name = cr.fetchone()
         name = name[0]
         if name in ('valarm', 'attendee'):
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 06e799b1686..8dd4ff053c9 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -34,11 +34,11 @@ class calendar_collection(osv.osv):
     def _get_root_calendar_directory(self, cr, uid, context=None):
         objid = self.pool.get('ir.model.data')
         try:
-            mid = objid._get_id(cr, uid, 'document', 'dir_calendars')            
+            mid = objid._get_id(cr, uid, 'document', 'dir_calendars')
             if not mid:
                 return False
-            root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']            
-            root_cal_dir = self.browse(cr, uid, root_id, context=context) 
+            root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
+            root_cal_dir = self.browse(cr,uid, root_id, context=context) 
             return root_cal_dir.name
         except Exception, e:
             import netsvc
@@ -67,7 +67,7 @@ class calendar_collection(osv.osv):
             ], limit=1, context=context)
 
         root_cal_dir = self._get_root_calendar_directory(cr, uid, context=context)
-        if not calendar_ids:            
+        if not calendar_ids:
             return root_cal_dir
         calendar_id = calendar_ids[0]
         calendar = calendar_obj.browse(cr, uid, calendar_id,
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index edfe79540e6..76ac424f1e0 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -145,53 +145,29 @@ class crm_case(object):
         @param context: A standard dictionary for contextual values"""
         if not context:
             context = {}
-        s = self.get_stage_dict(cr, uid, ids, context=context)
-        section = self._name
-        stage = False
+        stage_pool = self.pool.get('crm.case.stage')
+        model = self._name
         for case in self.browse(cr, uid, ids, context):
-            if section in s:
-                st =  not context.get('force_domain', False) and case.stage_id.id  or False
-                if st in s[section]:
-                    data = {'stage_id': s[section][st]}
-                    stage = s[section][st]
-                    self.write(cr, uid, [case.id], data)
-        return stage
-
-    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 = {}
-        stage_obj = self.pool.get('crm.case.stage')
-        res = self.read(cr, uid, ids, ['section_id', 'stage_id'], context)[0]
-        section_id = res['section_id'] and res['section_id'][0] or False
-        stage_id = res['stage_id'] and res['stage_id'][0] or False
-
-        # We select either the stages in the same section as the current stage
-        # if it a stage that does not have a section, or the stages of the 
-        # current section of the case
-        if stage_id:
-            stage_record = stage_obj.browse(cr, uid, stage_id)
-            if not stage_record.section_id:
-                section_id = False # only select stages without section
-
-        domain = [('object_id.model', '=', self._name), '|', ('section_id', '=', section_id),('section_id','=',False)]
-        if 'force_domain' in context and context['force_domain']:
-            domain += context['force_domain']
-        sid = stage_obj.search(cr, uid, domain, context=context)
-        s = {}
-        previous = {}
-        section = self._name
-
-        for stage in stage_obj.browse(cr, uid, sid, context=context):
-            s.setdefault(section, {})
-            s[section][previous.get(section, False)] = stage.id
-            previous[section] = stage.id
-        return s
+            next_stage = False
+            data = {}
+            domain = [('object_id.model', '=', model)]
+            if case.section_id and case.section_id.stage_ids:
+                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
+            stages = stage_pool.search(cr, uid, domain, order='sequence')
+            index = -1
+            if case.stage_id and case.stage_id.id in stages:
+                index = stages.index(case.stage_id.id)
+            if index + 1 == len(stages):
+                return False
+            else:
+                next_stage = stages[index + 1]
+            if next_stage:
+                data = {'stage_id': next_stage}
+                stage = stage_pool.browse(cr, uid, next_stage, context=context)
+                if stage.on_change:
+                    data.update({'probability': stage.probability})
+            self.write(cr, uid, [case.id], data, context=context)
+        return next_stage
 
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage
@@ -203,21 +179,28 @@ class crm_case(object):
         @param context: A standard dictionary for contextual values"""
         if not context:
             context = {}
-
-        s = self.get_stage_dict(cr, uid, ids, context=context)
-        section = self._name
         stage_pool = self.pool.get('crm.case.stage')
+        model = self._name
         for case in self.browse(cr, uid, ids, context):
-            if section in s:
-                st = not context.get('force_domain', False) and case.stage_id.id or False
-                s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
-                if st in s[section]:
-                    data = {'stage_id': s[section][st]}
-                    if s[section][st]:
-                        stage = stage_pool.browse(cr, uid, s[section][st], context=context)
-                        if stage.on_change:
-                            data.update({'probability': stage.probability})
-                    self.write(cr, uid, [case.id], data)
+            prev_stage = False
+            data = {}
+            domain = [('object_id.model', '=', model)]
+            if case.section_id and case.section_id.stage_ids:
+                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
+            stages = stage_pool.search(cr, uid, domain, order='sequence')
+            index = 0
+            if case.stage_id and case.stage_id.id in stages:
+                index = stages.index(case.stage_id.id)
+            if index == 0:
+                return False
+            else:
+                prev_stage = stages[index - 1]
+            if prev_stage:
+                data = {'stage_id': prev_stage}
+                stage = stage_pool.browse(cr, uid, prev_stage, context=context)
+                if stage.on_change:
+                    data.update({'probability': stage.probability})
+            self.write(cr, uid, [case.id], data, context=context)
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
@@ -492,6 +475,43 @@ class crm_case(object):
         return res
 
 
+class crm_case_stage(osv.osv):
+    """ Stage of case """
+
+    _name = "crm.case.stage"
+    _description = "Stage of case"
+    _rec_name = 'name'
+    _order = "sequence"
+
+    _columns = {
+        'name': fields.char('Stage Name', size=64, required=True, translate=True),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
+        'object_id': fields.many2one('ir.model', 'Object Name'),
+        'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
+        'on_change': fields.boolean('Change Probability Automatically', \
+                         help="Change Probability on next and previous stages."),
+        'requirements': fields.text('Requirements')
+    }
+    def _find_object_id(self, cr, uid, context=None):
+        """Finds id for case object
+        @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
+        """
+        object_id = context and context.get('object_id', False) or False
+        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0]
+
+    _defaults = {
+        'sequence': lambda *args: 1,
+        'probability': lambda *args: 0.0,
+        'object_id' : _find_object_id
+    }
+
+crm_case_stage()
+
+
 class crm_case_section(osv.osv):
     """Sales Team"""
 
@@ -517,7 +537,8 @@ class crm_case_section(osv.osv):
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'note': fields.text('Description'),
-        'working_hours': fields.float('Working Hours', digits=(16,2 )),
+        'working_hours': fields.float('Working Hours', digits=(16,2 )), 
+        'stage_ids':fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
     }
 
     _defaults = {
@@ -619,43 +640,6 @@ class crm_case_resource_type(osv.osv):
 crm_case_resource_type()
 
 
-class crm_case_stage(osv.osv):
-    """ Stage of case """
-
-    _name = "crm.case.stage"
-    _description = "Stage of case"
-    _rec_name = 'name'
-    _order = "sequence"
-
-    _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
-        'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
-        'on_change': fields.boolean('Change Probability Automatically', \
-                         help="Change Probability on next and previous stages."),
-        'requirements': fields.text('Requirements')
-    }
-    def _find_object_id(self, cr, uid, context=None):
-        """Finds id for case object
-        @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
-        """
-        object_id = context and context.get('object_id', False) or False
-        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
-
-    _defaults = {
-        'sequence': lambda *args: 1,
-        'probability': lambda *args: 0.0,
-        'object_id' : _find_object_id
-    }
-
-crm_case_stage()
-
 def _links_get(self, cr, uid, context=None):
     """Gets links value for reference field
     @param self: The object pointer
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 76260082602..263339c7121 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -126,8 +126,8 @@ class crm_lead(crm_case, osv.osv):
 
         'contact_name': fields.char('Contact Name', size=64), 
         'partner_name': fields.char("Partner Name", size=64),
-        'optin': fields.boolean('Opt-In'),
-        'optout': fields.boolean('Opt-Out'),
+        'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
+        'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 2616d97d612..cb80a7d28e9 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -8,7 +8,6 @@
             <field name="name">New</field>
             <field eval="'10'" name="probability"/>
             <field eval="'1'" name="sequence"/>
-            <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
@@ -16,7 +15,6 @@
             <field name="name">Qualification</field>
             <field eval="'20'" name="probability"/>
             <field eval="'2'" name="sequence"/>
-            <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
@@ -24,7 +22,6 @@
             <field name="name">Proposition</field>
             <field eval="'40'" name="probability"/>
             <field eval="'3'" name="sequence"/>
-            <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
@@ -32,7 +29,6 @@
             <field name="name">Negotiation</field>
             <field eval="'60'" name="probability"/>
             <field eval="'4'" name="sequence"/>
-            <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
@@ -40,7 +36,6 @@
             <field name="name">Win</field>
             <field eval="'100'" name="probability"/>
             <field eval="'5'" name="sequence"/>
-            <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
@@ -48,10 +43,15 @@
             <field name="name">Lost</field>
             <field eval="'0'" name="probability"/>
             <field eval="'6'" name="sequence"/>
-            <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
+        <record model="crm.case.section" id="section_sales_department">
+            <field name="name">Sales Department</field>
+            <field name="code">Sales</field>
+            <field name="stage_ids" eval="[(4, ref('stage_lead1')), (4, ref('stage_lead2')), (4, ref('stage_lead3')), (4, ref('stage_lead4')), (4, ref('stage_lead5')), (4, ref('stage_lead6'))]"/>
+        </record>
+
     <!--        CASE CATEGORY2(category2_id)        -->
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 65daf5d79d5..b98d26a0e6e 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -8,9 +8,8 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id':section_id}</field>
+        <field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id}</field>
         <field name="help">A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.</field>
     </record>
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2cbd1581ff5..c1e37445c6c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -55,8 +55,7 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id"
-                        domain="[('section_id','=',section_id), ('section_id','=',False), ('object_id.model', '=', 'crm.lead')]" />
+                    <field name="stage_id" readonly="1"/>
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
                             states="open,pending,draft" type="object"
@@ -235,7 +234,7 @@
                 <field name="referred" invisible="1"/>
                 <field name="channel_id" invisible="1"/>
 
-                <field name="stage_id" />
+                <field name="stage_id" readonly="1"/>
                 <button name="stage_previous" string="Previous Stage"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next Stage"
@@ -318,7 +317,7 @@
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team(s)"/>
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
@@ -342,8 +341,9 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
                     <filter string="Campaign" icon="terp-stock_symbol-selection"
@@ -351,11 +351,10 @@
                     <filter string="Channel" icon="terp-stock_symbol-selection"
                         domain="[]" context="{'group_by':'channel_id'}" />
                     <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Creation Month" icon="terp-go-month"
+                    <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7601fcdab43..7726280a05f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -49,7 +49,7 @@
         <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_user_id":uid}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
         <field name="help">The calendar of meetings is shared between sales teams and fully integrated with the others applications like the employee holidays. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 06cb0280567..2821024bfbf 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -312,7 +312,7 @@
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
                                <filter icon="terp-personal+"
-                                   domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                   domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sales Team(s)" />
                            </field>
                            <field name="user_id" select="1"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 34f5e542ab0..b52694d8b20 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,9 @@
                             <label string="Stage:" align="1.0"/>
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
-                                on_change="onchange_stage_id(stage_id)"
-                                domain="['|',('section_id','=',section_id),('section_id','=',False),('object_id.model', '=', 'crm.lead')]" />
+                                    on_change="onchange_stage_id(stage_id)"
+                                    domain="[('object_id.model', '=', 'crm.lead')]"
+                                    readonly="1" />
                                 <button name="stage_previous"
                                 states="open,pending" type="object"
                                 icon="gtk-go-back" string="" />
@@ -211,7 +212,7 @@
                 <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');red:date_deadline and (date_deadline &lt; current_date)">
+                    <tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                         <field name="date_deadline" invisible="1"/>
                         <field name="create_date"/>
                         <field name="name" string="Opportunity"/>
@@ -302,7 +303,7 @@
                             context="{'invisible_section': False}"
                             widget="selection">
                             <filter icon="terp-personal+"
-                                domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                 context="{'invisible_section': False}"
                                 help="My Sales Team(s)" />
                             <filter icon="terp-personal+"
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 0c7385532fb..96dde7139df 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -61,9 +61,6 @@ class crm_phonecall(crm_case, 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\'.'), 
         '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),('section_id','=',False),\
-                            ('object_id.model', '=', 'crm.phonecall')]"), 
         'date_open': fields.datetime('Opened', readonly=True),
         # phonecall fields
         'duration': fields.float('Duration', help="Duration in Minutes"), 
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 097540bada4..0e2bb6511c5 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -16,23 +16,5 @@
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
     </record>
 
-    <!--
-    Case Stage
-    -->
-    <record model="crm.case.stage" id="stage_phone1">
-        <field name="name">Planned</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_phone2">
-        <field name="name">Held</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_phone3">
-        <field name="name">Not Held</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
-    </record>
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 824c40454be..683cbd9735f 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -16,7 +16,6 @@
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
-			<field name="stage_id" ref="crm.stage_phone1"/>
 			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
 			<field eval="2.3" name="duration"/>
 		</record>
@@ -32,7 +31,6 @@
 			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
-			<field name="stage_id" ref="crm.stage_phone2"/>
 			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
 			<field eval="1.5" name="duration"/>
 		</record>
@@ -48,7 +46,6 @@
 			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
-			<field name="stage_id" ref="crm.stage_phone3"/>
 			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
 			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 			<field eval="5.0" name="duration"/>
@@ -64,7 +61,6 @@
 			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
-			<field name="stage_id" ref="crm.stage_phone1"/>
 			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
 			<field eval="3.45" name="duration"/>
 		</record>
@@ -80,7 +76,6 @@
 			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
-			<field name="stage_id" ref="crm.stage_phone2"/>
 			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
 			<field eval="2.08" name="duration"/>
 		</record>
@@ -96,7 +91,6 @@
 			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
-			<field name="stage_id" ref="crm.stage_phone3"/>
 			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
 			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 			<field eval="8.56" name="duration"/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 141a6add970..c4263a47a18 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -31,7 +31,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id':section_id}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -67,7 +67,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context" eval="'{\'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
+        <field name="context" eval="'{\'search_default_section_id\':section_id, \'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">Trace easily all your Inbound calls. The Inbound menu open a search view in editable mode, so you can easily modify or add a new call record. With the actions buttons convert a lead into an opportunity or plan a meeting.</field>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0832c0a16ee..afc6edd5295 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -71,7 +71,7 @@
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                     <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
-                     icon="gtk-redo"
+                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
 
@@ -150,7 +150,7 @@
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                     <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
-                     icon="gtk-redo"
+                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
 
@@ -250,8 +250,8 @@
                    name="current"
                    domain="[('state','in', ('draft','open','pending'))]"/>
                <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
-                    ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
+                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
                    name="today"
                    help="Todays's Phonecalls"
                />
@@ -272,7 +272,7 @@
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
                </field>
                <newline/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 061888d02fb..bb15b3631b8 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -48,6 +48,10 @@
                             <separator string="Team Members" colspan="4"/>
                             <field name="member_ids" nolabel="1" colspan="4"/>
                         </page>
+                        <page string="Stages">
+                            <separator string="Select stages for this Sales Team" colspan="4"/>
+                            <field name="stage_ids" colspan="4" nolabel="1"/>
+                        </page>
                         <page string="Notes">
                             <field name="note" select="1" colspan="4" nolabel="1"/>
                         </page>
@@ -97,8 +101,6 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="probability"/>
-                    <field name="section_id"/>
-
                 </tree>
             </field>
         </record>
@@ -113,7 +115,6 @@
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1"/>
                     <field name="object_id" invisible="1" />
                     <field name="sequence"/>
                     <field name="probability"/>
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 671dec69ad9..3458513788a 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-30 08:13+0000\n"
+"PO-Revision-Date: 2010-10-01 11:57+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 69f08faac79..9cef18594a0 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -101,9 +101,7 @@ class crm_lead_report(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]", readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="('object_id.model', '=', 'crm.lead')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d35b8aea295..c37c7bcec57 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -99,13 +99,13 @@
                         <field name="section_id"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My team" />
                         </field>
                         <field name="user_id" string="Salesman">
-                            <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                    </group>
                    <newline/>
@@ -125,14 +125,16 @@
                   </group>
                    <newline/>
                    <group expand="1" string="Group By...">
-                        <filter string="User" name="user" icon="terp-personal"
+                        <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <separator orientation="vertical" />
+                       <filter string="Company" icon="terp-go-home"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
@@ -146,10 +148,6 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}" help="Day on which lead/opportunity is created"/>
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 259764e4170..9502c39ad06 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -100,9 +100,6 @@ class crm_phonecall_report(osv.osv):
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]", readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
@@ -130,7 +127,6 @@ class crm_phonecall_report(osv.osv):
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
-                    c.stage_id,
                     c.duration,
                     c.company_id,
                     c.priority,
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 8d8ee946ae0..0f5452ad736 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -14,7 +14,6 @@
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
                     <field name="priority" invisible="1"/>
-                    <field name="stage_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -92,14 +91,14 @@
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
                             help="Phone calls which are in draft and open state"/>
-                        <filter icon="gtk-media-pause"
-                            string="Not Held"
-                            domain="[('state','=','pending')]"
-                            help="Phone calls which are in pending state"/>
                         <filter icon="terp-camera_test"
                             string="Held"
                             domain="[('state','=','done')]"
                             help="Phone calls which are in closed state"/>
+                        <filter icon="gtk-media-pause"
+                            string="Not Held"
+                            domain="[('state','=','pending')]"
+                            help="Phone calls which are in pending state"/>
                       <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
@@ -110,15 +109,15 @@
                            help="My team" />
                         </field>   
                           <field name="user_id" string="Salesman" select="1">
-                            <filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                            </field>
                    </group>
                    <newline/>
                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                       <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" widget="selection" string="Type"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]" />
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                            <newline/>
@@ -128,19 +127,16 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                        
+                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 9c63e611e93..5f3863882f5 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -10,6 +10,17 @@
         <field name="name">Sales / User</field>
     </record>
 
+    <record id="base.group_sale_salesman_personal" context="{'noadmin':True}" model="res.groups">
+        <field name="name">Sales / User / See Personal Leads</field>
+    </record>
+
+    <record id="crm_rule_personal_lead" model="ir.rule">
+        <field name="name">Personal Leads</field>
+        <field ref="model_crm_lead" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_personal'))]"/>
+    </record>
+
     <record model='ir.ui.menu' id='base.menu_base_partner'>
         <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 13dae7b35a1..de4d616b67b 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -57,6 +57,7 @@ class crm_send_new_email(osv.osv_memory):
         'body': fields.text('Message Body', required=True),
         'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
         'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
+        'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."), 
     }
 
     def action_send(self, cr, uid, ids, context=None):
@@ -79,6 +80,7 @@ class crm_send_new_email(osv.osv_memory):
                 (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
             ]
 
+            subtype = 'plain'
             message_id = None
             ref_id = None
 
@@ -119,6 +121,9 @@ class crm_send_new_email(osv.osv_memory):
             if message_id:
                 x_headers['References'] = "%s" % (message_id)
 
+            if obj.html:
+                subtype = 'html'
+
             flag = tools.email_send(
                 email_from,
                 emails,
@@ -126,13 +131,14 @@ class crm_send_new_email(osv.osv_memory):
                 body,
                 email_cc=email_cc,
                 attach=attach,
+                subtype=subtype,
                 reply_to=obj.reply_to,
                 openobject_id=str(case.id),
                 x_headers=x_headers
             )
 
-#            if not flag:
-#                raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
+            if not flag:
+                raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
 
             msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
             case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 91a934da0e0..ebbb72592f2 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -16,6 +16,7 @@
                     <field name="email_to" />
                     <field name="email_cc"/>
                     <field name="subject"/>
+                    <field name="html"/>
                     </group>
                     <notebook colspan="6">
                         <page string="Message">
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index d6c6603b829..8e514f91f39 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -70,7 +70,7 @@ class crm_claim(crm.crm_case, osv.osv):
         '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'), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('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.\
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index cd8db8499a5..fc387658c97 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -71,6 +71,11 @@
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
         </record>
-    
+
+        <record model="crm.case.section" id="crm.section_sales_department">
+            <field name="name">Sales Department</field>
+            <field name="code">Sales</field>
+            <field name="stage_ids" eval="[(4, ref('stage_claim1')), (4, ref('stage_claim2')), (4, ref('stage_claim3')), (4, ref('stage_claim4')), (4, ref('stage_claim5'))]"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 3e853936541..3a4b63047ea 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -14,7 +14,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_user_id":uid}</field>
+            <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
             <field name="help">Record and trace your customers' claims here. A claim is defined by a client name, several types, a status and a priority level. A  claim can also be a preventive or repairing action. A claim can be linked to a reference like a sales order, or a lot. You can send emails with attachments and get the history of the claim treatment (emails send, interventions type, etc.). </field>
         </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index da73f879eab..6b5f21df920 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -42,7 +42,7 @@
             <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';gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Claims" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" />
@@ -109,9 +109,9 @@
                                     <field name="section_id" widget="selection"/>
                                     <label string="Stage: " align="1.0"/>
                                     <group colspan="1" col="3">
-                                        <field name="stage_id" nolabel="1"
+                                        <field name="stage_id" nolabel="1" readonly="1"
                                             on_change="onchange_stage_id(stage_id)"
-                                            domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.claim')]" />
+                                            domain="[('object_id.model', '=', 'crm.claim')]" />
                                         <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                                     </group>
@@ -274,7 +274,11 @@
                                help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
-                       widget="selection"/>
+                       widget="selection">
+                       <filter icon="terp-personal+"
+                            domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="My section" />
+                    </field>
                    <newline/>
                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 01b79db4823..65e9f3e7e08 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -62,9 +62,7 @@ class crm_claim_report(osv.osv):
         '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),\
-                        ('object_id.model', '=', 'crm.claim')]", readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.claim')]", readonly=True),
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5b184c8ef66..5eeecf3d3ad 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -101,7 +101,7 @@
                             domain="[('state','=','pending')]"/>
 
                            <separator orientation="vertical" />
-                           <field name="section_id" string="Sales Team"
+                              <field name="section_id" string="Sales Team"
                                default="context.get('section_id', False)"
                                context="{'invisible_section': False}">
 
@@ -118,9 +118,9 @@
                         help="My company"/>
                         </field>
 
-                          <field name="user_id" string="Salesman" select="1">
-                            <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
-                           </field>
+                      	<field name="user_id" string="Salesman" select="1">
+	            			<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+               			</field>
                    </group>
                    <newline/>
                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -141,7 +141,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 9bf5f3bb3ee..21d5e9081bd 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -61,9 +61,7 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'partner_name2': fields.char('Employee Email', size=64), 
             'partner_phone': fields.char('Phone', size=32), 
             'partner_mobile': fields.char('Mobile', size=32), 
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.fundraising')]"), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('object_id.model', '=', 'crm.fundraising')]"), 
             'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
                              domain="[('section_id','=',section_id)]"), 
             'duration': fields.float('Duration'), 
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 3c97e662d30..ea94e8be92a 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -13,7 +13,7 @@
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
-        <field name="context">{"search_default_user_id":uid,"search_default_current":1}</field>
+        <field name="context">{"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
         <field name="help">When you wish to support your organization or a campaign, trace here all your activities for collecting money. The menu open a search list where you can find funds description, email, history, probability of success. Several actions buttons allows you to easily modify your different fund status.</field>
     </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 2021245c1f5..6bcf019dabe 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -89,7 +89,7 @@
                         <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')]"/>
+                        <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Funds">
@@ -274,7 +274,7 @@
                             </field>
                             <field name="section_id" select="1" widget="selection" string="Sales Team">
                                 <filter icon="terp-personal+"
-                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                    domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My section" />
                             </field>
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 68cd85674ba..ab90f7ad0c1 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -118,7 +118,7 @@
                         </field>
 
                       	<field name="user_id" select="1" string="Salesman">
-	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
@@ -138,7 +138,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
                         <filter string="Sales Team" icon="terp-personal+"
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 30267e7b4f2..867c8358c83 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -11,7 +11,7 @@
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="context">{"search_default_user_id":uid}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
         <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
     </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 2abd5d0eff9..0531092dd98 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -249,7 +249,7 @@
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My section" />
                     </field>
                     <newline/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 8bb5307e62b..9490172e3e8 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,23 +114,24 @@
                         help="My company"/>
                         </field>
                          <field name="user_id" string="Salesman">
-                         <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                         <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                          </field>
                    </group>
                    <newline/>
                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
+                         <field name="priority" string="Priority"/>
+                         <field name="categ_id"/>
+                         <field name="date_closed" string="Close Date"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-personal"
+                        <filter string="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                        <filter string="Partner" icon="terp-personal"
+                        <filter string="Partner" icon="terp-partner"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
                             
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index ac4c7684d9e..0b4659c7adb 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -63,9 +63,7 @@ class crm_lead_report_assign(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]", readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('object_id.model', '=', 'crm.lead')]"),
         'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 2d38cd8862b..71e784ca90f 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -45,7 +45,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                       <filter string="User" name="user" icon="terp-personal"
+                       <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_assigned_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
diff --git a/addons/decimal_precision/decimal_precision_view.xml b/addons/decimal_precision/decimal_precision_view.xml
index 0065f7f7c7c..23bfbe429fd 100644
--- a/addons/decimal_precision/decimal_precision_view.xml
+++ b/addons/decimal_precision/decimal_precision_view.xml
@@ -24,7 +24,7 @@
             </field>
         </record>
         <record model="ir.actions.act_window" id="action_decimal_precision_form">
-                <field name="name">Decimal Accuracy Definitions</field>
+                <field name="name">Decimal Accuracy</field>
                 <field name="res_model">decimal.precision</field>
         </record>
         <menuitem
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
new file mode 100644
index 00000000000..6d812b3a358
--- /dev/null
+++ b/addons/email_template/i18n/ru.po
@@ -0,0 +1,1238 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 05:34+0000\n"
+"PO-Revision-Date: 2010-10-02 08:00+0000\n"
+"Last-Translator: irbiserg@mail.ru <irbiserg@mail.ru>\n"
+"Language-Team: Russian <ru@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-10-03 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Настройка Email аккаунта"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr "Почта для многократной отправки сохранена в исходящих."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Data"
+msgstr "Данные электронной почты"
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Получатель (Кому)"
+
+#. module: email_template
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Мастер завершён."
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Обычный текст и HTML без вложений."
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"Неправильный логин к аккаунту почты %s. Вероятная причина: логин не "
+"существует. Ошибка: %s"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Тело"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "Ошибка удаления записи"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+"Выберите, если этот аккаунт почты не принадлежит определенному пользователю, "
+"а организации. Например: info@companydomain.com"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Отправить сейчас"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "Неприменимо"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Учетные записи"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Отправить всю почту"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Ссылка сервера почты"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "My Accounts"
+msgstr "Мои аккаунты"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Отправить письмо"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Подтверждено"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "HTML код"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+msgstr ""
+"Образец названия файла может быть определен например как: 2009_SO003.pdf"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Аккаунт почты"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "Отправка почты не удалась для одного или более объектов."
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Язык по умолчанию для почты. Можно использовать шаблоны, например: "
+"${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number,eg:SMTP-587 "
+msgstr "Введите номер порта, например: SMTP-587 "
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Обратный адрес"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Удалить действие"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Одобрите учетную запись"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+msgid "E-MAIL Templates"
+msgstr "Шаблон письма"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Отправленный документ"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "Успешно выполнено"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "ОК"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "И HTML и текст (альтернативный вариант)"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Mako templates not installed"
+msgstr "Шаблоны Mako не установлены"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Запрашиваемые письма не найдены"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Download Full Mail"
+msgstr "Скачать письмо целиком"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid "The default recipient of email.Placeholders can be used here."
+msgstr "Не указан получатель письма. Укажите его здесь."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Mailboxes"
+msgstr "Почтовые ящики"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Прикрепленные файлы"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (только для python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Из почты"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Warning"
+msgstr "Предупреждение"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Аккаунты"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Track campaign items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Тело (Текст)"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Предмет"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr "Причина: %s"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: yourname@yourdomain.com "
+msgstr "например: yourname@yourdomain.com "
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "От"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Шаблон"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Шаблон (текст)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Отправка"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Вставьте в пустое поле"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Тело (HTML)"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Отправить/Получить"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Просмотр шаблона"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Тело (текст - только веб-клиент)"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Кнопка мастера"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Out going connection test failed"
+msgstr "Тест связи потерпел неудачу"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Проверьте исходящую связь"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Почтовый ящик"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Вы можете приложить существующие файлы к этому шаблону, таким образом они "
+"будут добавлены во всех электронных письмах, созданных из этого шаблона"
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Аккаунт пользователя"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Прикрепить подпись к письму"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Отчет"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Продвинутый"
+
+#. module: email_template
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Недопустимые параметры"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Некорректный формат XML для просмотра архитектуры!"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "Тело HTML"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Аккаунт временно приостановлен"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Предпросмотр шаблона"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Сервер"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Язык"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Тело (Необработанный HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Подпись"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Подмодель"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Тело (Обычный текст)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Тело (Текст)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Дата записи/передачи"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Послать сообщение"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "Сведения о сервере"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Сведения о почте"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "Не определен SMTP сервер или порт"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "Примечание: Этот HTML сырой"
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The default subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"e-mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Error sending mail: %s\" % str(e)))\n"
+"        \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"        if ids is None:\n"
+"            ids = []\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        filters = [('folder', '=', 'outbox"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "File Name Pattern"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Django templates not installed"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port "
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Copy of template "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Personal Accounts"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,object_name:0
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg:smtp.gmail.com "
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
+msgid "Company Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+msgid "Default Subject"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this if you want the outgoing e-mails to include a tracking marker "
+"that makes it possible to identify the replies an link them back to the "
+"campaign item"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 23ae3a9d7e3..c80c0cd91d4 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -58,14 +58,6 @@
                 </search>
              </field>
          </record>
-        <record id="open_module_tree_department_tree" model="ir.actions.act_window">
-            <field name="name">Departments</field>
-            <field name="res_model">hr.department</field>
-            <field name="view_type">tree</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="search_view_id" ref="view_department_filter"/>
-        </record>
-       <menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
 
         <record id="open_module_tree_department" model="ir.actions.act_window">
             <field name="name">Departments</field>
@@ -75,10 +67,9 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </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="hr.menu_hr_management" sequence="6"/>
 
-        <record model="ir.ui.view" id="view_users_form_inherit">
+       <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
             <field name="type">form</field>
             <field name="model">res.users</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index 250120c5a45..b22a88c5036 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -9,11 +9,11 @@
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
         </record>
 
-        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+        <!-- record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
-        </record>
+        </record-->
 
     </data>
 </openerp>
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index 961f16f541f..f442124193a 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -34,6 +34,7 @@
         "mail_gateway_view.xml",
         "res_partner_view.xml",
         'security/ir.model.access.csv'
+
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 2f14fc6a5e5..9900540acae 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -179,6 +179,50 @@ class mailgate_message(osv.osv):
     '''
     Mailgateway Message
     '''
+    def open_document(self, cr, uid, ids, context):
+        """ To Open Document
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: the ID of messages
+        @param context: A standard dictionary
+        """
+        action_data = False
+        if ids:
+            message_id = ids[0]
+            mailgate_data = self.browse(cr, uid, message_id)
+            model = mailgate_data.model
+            res_id = mailgate_data.res_id
+
+            action_pool = self.pool.get('ir.actions.act_window')
+            action_ids = action_pool.search(cr, uid, [('res_model', '=', model)])
+            if action_ids:
+                action_data = action_pool.read(cr, uid, action_ids[0], context=context)
+                action_data.update({
+                    'res_id': res_id,
+                    'nodestroy': True
+                    })
+        return action_data
+    
+    def open_attachment(self, cr, uid, ids, context):
+        """ To Open attachments
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: the ID of messages
+        @param context: A standard dictionary
+        """
+        action_data = False
+        action_pool = self.pool.get('ir.actions.act_window')
+        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
+        if action_ids:
+            action_data = action_pool.read(cr, uid, action_ids[0], context=context)
+            action_data.update({
+                'domain': [('res_id','in',ids),('res_model','=',self._name)],
+                'nodestroy': True
+                })
+        return action_data
+
     def truncate_data(self, cr, uid, data, context=None):
         data_list = data and data.split('\n') or []
         if len(data_list) > 3:
@@ -547,3 +591,5 @@ class mailgate_tool(osv.osv_memory):
         return res
 
 mailgate_tool()
+
+# 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
index de1a88c34c7..706996ed55a 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
         <record model="ir.ui.view" id="view_mailgate_message_form">
-            <field name="name">mailgate.message.form</field>
+          <field name="name">mailgate.message.form</field>
             <field name="model">mailgate.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="mailgate message">
+             <form string="mailgate message">
                     <group colspan="4" col="6">
                         <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
                         <field name="date" required="1" select="1"/>
@@ -24,10 +24,13 @@
                            </group>
                            <group col="2" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
-                                    <field name="model" readonly="1"/>
+                                <field name="model" readonly="1"/>
+                                <group col="3" colspan="2">
                                     <field name="res_id"  readonly="1"/>
-                                    <field name="message_id" />
-                                    <field name="ref_id" />
+                                    <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
+                                </group>
+                                <field name="message_id" />
+                                <field name="ref_id" />
                            </group>
                            <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4" />
@@ -53,6 +56,8 @@
                     <field name="user_id" string="Owner"/>
                     <field name="message_id" string="Message" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
+                    <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
+                    <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
@@ -66,12 +71,12 @@
                     <field name="name" string="Subject"/>
                     <field name="date" />
                     <field name="user_id" string="Owner" default="uid"/>
-                    <field name="description" />
+                    <field name="partner_id" string="Partner Name"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                         <filter string="Owner" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                         <separator orientation="vertical"/>
+                        <filter string="Owner" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                          <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
                          <separator orientation="vertical"/>
                          <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
@@ -191,7 +196,6 @@
             view_id="view_mailgate_message_tree"
             />
 
-        
 
       <menuitem name="Emails" id="menu_base_config_mail"
         parent="base.menu_base_partner" sequence="5" />
@@ -201,6 +205,11 @@
         action="mail_gateway.action_view_mailgate_message"
        />
 
+    <act_window
+       id="act_res_partner_open_email" name="Attachments"
+        res_model="ir.attachment"
+       src_model="mailgate.message"
+       domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index e303ceb3378..e9c4f9f37b2 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -232,14 +232,6 @@
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
-        <record id="mrp_bom_8" model="mrp.bom">
-            <field name="name">HDD Seagate</field>
-            <field name="sequence">26</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-            <field name="type">normal</field>
-            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
-        </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
             <field name="sequence">29</field>
@@ -563,6 +555,14 @@
         <!--
     Resource: mrp.bom new EVV
     -->
+    <record id="mrp_bom_defaultbomforshelfofcm0" model="mrp.bom">
+        <field name="name">Default BOM for Shelf of 100cm</field>
+        <field name="code">SHE100</field>
+            <field name="sequence">129</field>
+        <field name="product_id" ref="product.product_product_shelfofcm0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_qty">1.0</field>
+    </record>
 
     <record id="mrp_bom_assemblysection0" model="mrp.bom">
         <field name="name">Assembly Section</field>
@@ -591,15 +591,6 @@
         <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
     </record>
 
-    <record id="mrp_bom_defaultbomforshelfofcm0" model="mrp.bom">
-        <field name="name">Default BOM for Shelf of 100cm</field>
-        <field name="code">SHE100</field>
-            <field name="sequence">129</field>
-        <field name="product_id" ref="product.product_product_shelfofcm0"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_qty">1.0</field>
-    </record>
-
     <record id="mrp_bom_rearpanelarm0" model="mrp.bom">
            <field name="sequence">131</field>
        <field name="product_id" ref="product.product_product_rearpanelarm0"/>
@@ -647,15 +638,6 @@
         <field name="type">phantom</field>
     </record>
 
-    <record id="mrp_bom_rearpanelarm1" model="mrp.bom">
-           <field name="sequence">141</field>
-       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
-       <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
-           <field name="product_qty">1.0</field>
-       <field name="name">Rear panel SHE100</field>
-    </record>
-
     <record id="mrp_bom_assemblysection2" model="mrp.bom">
         <field name="name">Assembly Section</field>
             <field name="sequence">143</field>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 3a6ab81a308..52bcf3bcd4a 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -131,6 +131,8 @@ class report_custom(report_rml):
                 </row>
         """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
 
+        purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
+
         for product in product_pool.browse(cr, uid, ids, context=context):
             bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
             title = "<title>%s</title>" %(_("Cost Structure"))
@@ -150,8 +152,8 @@ class report_custom(report_rml):
                     <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col f='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
                     </row></lines>'"""
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
@@ -177,8 +179,8 @@ class report_custom(report_rml):
                     <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
                     </row></lines>'"""
 
                 total2 = 0
@@ -195,14 +197,14 @@ class report_custom(report_rml):
                     <col/>
                     <col/>
                     <col/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total2) +' '+ company_currency.symbol +"""</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
                     </row></lines>'"""
                 xml += """<lines style='total'> <row>
                     <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total+total2) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>"""+ rml_obj.formatLang(total+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
                     </row></lines>'"""
 
         xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 15e94bd6f4c..922e460ab6d 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -22,9 +22,8 @@
 from report.render import render
 from report.interface import report_int
 from pychart import *
-from mx.DateTime import *
 import time
-from datetime import datetime
+from datetime import date, datetime, timedelta
 from dateutil.relativedelta import relativedelta
 
 from report.misc import choice_colors
@@ -55,8 +54,8 @@ class report_custom(report_int):
             stop = start
         if time_unit == 'month':
             dates = {}
-            a = Date(*map(int, start.split("-"))).year*12+Date(*map(int, start.split("-"))).month
-            z = Date(*map(int,  stop.split("-"))).year*12+Date(*map(int,  stop.split("-"))).month+1
+            a = int(start.split("-")[0])*12 + int(start.split("-")[1])
+            z = int(stop.split("-")[0])*12 + int(stop.split("-")[1]) + 1
             for i in range(a,z):
                 year = i/12
                 month = i%12
@@ -66,27 +65,31 @@ class report_custom(report_int):
                 months = {1:"January",2:"February",3:"March",4:"April",5:"May",6:"June",7:"July",8:"August",9:"September",10:"October",11:"November",12:"December"}
                 dates[i] = {
                     'name' :months[month],
-                    'start':(datetime.date(year, month, 2) + relativedelta(day=1)).strftime('%Y-%m-%d'),
-                    'stop' :(datetime.date(year, month, 2) + relativedelta(day=-1)).strftime('%Y-%m-%d'),
+                    'start':(datetime(year, month, 2) + relativedelta(day=1)).strftime('%Y-%m-%d'),
+                    'stop' :(datetime(year, month, 2) + relativedelta(day=31)).strftime('%Y-%m-%d'),
                 }
             return dates
         elif time_unit == 'week':
             dates = {}
-            a = Date(*map(int, start.split("-"))).iso_week[0]*52+Date(*map(int, start.split("-"))).iso_week[1]
-            z = Date(*map(int,  stop.split("-"))).iso_week[0]*52+Date(*map(int,  stop.split("-"))).iso_week[1]
+            start_week = date(int(start.split("-")[0]),int(start.split("-")[1]),int(start.split("-")[2])).isocalendar()
+            end_week = date(int(stop.split("-")[0]),int(stop.split("-")[1]),int(stop.split("-")[2])).isocalendar()
+            a = int(start.split("-")[0])*52 + start_week[1]
+            z = int(stop.split("-")[0])*52 + end_week[1]
             for i in range(a,z+1):
                 year = i/52
                 week = i%52
+                d = date(year, 1, 1)
+                
                 dates[i] = {
                     'name' :"Week #%d" % week,
-                    'start':ISO.WeekTime(year, week, 1).strftime('%Y-%m-%d'),
-                    'stop' :ISO.WeekTime(year, week, 7).strftime('%Y-%m-%d'),
+                    'start':(d + timedelta(days=-d.weekday(), weeks=week)).strftime('%Y-%m-%d'),
+                    'stop' :(d + timedelta(days=6-d.weekday(), weeks=week)).strftime('%Y-%m-%d'),
                 }
             return dates
         else: # time_unit = day
             dates = {}
-            a = Date(*map(int, start.split("-")))
-            z = Date(*map(int, stop.split("-")))
+            a = datetime(int(start.split("-")[0]),int(start.split("-")[1]),int(start.split("-")[2]))
+            z = datetime(int(stop.split("-")[0]),int(stop.split("-")[1]),int(stop.split("-")[2]))
             i = a
             while i <= z:
                 dates[map(int,i.strftime('%Y%m%d').split())[0]] = {
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 52a8a81cb49..3328f24a59f 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -21,10 +21,9 @@
 
 from osv import fields
 from osv import osv
-import datetime
 import netsvc
 import time
-from mx import DateTime
+from datetime import datetime
 from tools.translate import _
 
 #----------------------------------------------------------
@@ -75,7 +74,6 @@ class mrp_production_workcenter_line(osv.osv):
         for op in ops:
             res[op.id] = False
             if op.date_planned:
-                d = DateTime.strptime(op.date_planned,'%Y-%m-%d %H:%M:%S')
                 i = intervals[(op.date_planned, op.hour, op.workcenter_id.calendar_id.id)]
                 if i:
                     res[op.id] = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
@@ -176,8 +174,8 @@ class mrp_production_workcenter_line(osv.osv):
         date_now = time.strftime('%Y-%m-%d %H:%M:%S')
         obj_line = self.browse(cr, uid, ids[0])
         
-        date_start = datetime.datetime.strptime(obj_line.date_start,'%Y-%m-%d %H:%M:%S')
-        date_finished = datetime.datetime.strptime(date_now,'%Y-%m-%d %H:%M:%S')
+        date_start = datetime.strptime(obj_line.date_start,'%Y-%m-%d %H:%M:%S')
+        date_finished = datetime.strptime(date_now,'%Y-%m-%d %H:%M:%S')
         delay += (date_finished-date_start).days * 24
         delay += (date_finished-date_start).seconds / float(60*60)
         
@@ -259,9 +257,9 @@ class mrp_production(osv.osv):
         """ Computes planned and finished dates for work order.
         @return: Calculated date
         """
-        dt_end = DateTime.now()
+        dt_end = datetime.now()
         for po in self.browse(cr, uid, ids, context=context):
-            dt_end = DateTime.strptime(po.date_start or po.date_planned, '%Y-%m-%d %H:%M:%S')
+            dt_end = datetime.strptime(po.date_planned, '%Y-%m-%d %H:%M:%S')
             if not po.date_start:
                 self.write(cr, uid, [po.id], {
                     'date_start': po.date_planned
@@ -275,7 +273,7 @@ class mrp_production(osv.osv):
                     del context['__last_update']
                 if (wc.date_planned < dt.strftime('%Y-%m-%d %H:%M:%S')) or mini:
                     self.pool.get('mrp.production.workcenter.line').write(cr, uid, [wc.id],  {
-                        'date_planned':dt.strftime('%Y-%m-%d %H:%M:%S')
+                        'date_planned': dt.strftime('%Y-%m-%d %H:%M:%S')
                     }, context=context, update=False)
                     i = self.pool.get('resource.calendar').interval_get(
                         cr,
@@ -287,7 +285,7 @@ class mrp_production(osv.osv):
                     if i:
                         dt_end = max(dt_end, i[-1][1])
                 else:
-                    dt_end = DateTime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
+                    dt_end = datetime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
                 old = wc.sequence or 0
             super(mrp_production, self).write(cr, uid, [po.id], {
                 'date_finnished': dt_end
@@ -302,7 +300,7 @@ class mrp_production(osv.osv):
             if po.allow_reorder:
                 continue
             todo = po.move_lines
-            dt = DateTime.strptime(po.date_start,'%Y-%m-%d %H:%M:%S')
+            dt = datetime.strptime(po.date_start,'%Y-%m-%d %H:%M:%S')
             while todo:
                 l = todo.pop(0)
                 if l.state in ('done','cancel','draft'):
@@ -426,8 +424,8 @@ class mrp_operations_operation(osv.osv):
                 if not i: continue
                 if code_lst[i-1] not in ('resume','start'):
                    continue
-                a = datetime.datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
-                b = datetime.datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
+                a = datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
+                b = datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
                 diff += (b-a).days * 24
                 diff += (b-a).seconds / float(60*60)
         return diff
@@ -513,7 +511,7 @@ class mrp_operations_operation(osv.osv):
             if code.start_stop=='done':
                 self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
                 wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr)
-                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
 
             if code.start_stop=='pause':
                 self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
@@ -551,7 +549,7 @@ class mrp_operations_operation(osv.osv):
         'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
         }
     _defaults={
-        'date_start': lambda *a:DateTime.now().strftime('%Y-%m-%d %H:%M:%S')
+        'date_start': lambda *a:datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     }
 
 mrp_operations_operation()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
index 3df29246757..6e024b39d35 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
+++ b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
@@ -1 +1,2 @@
 python addin.py
+pause
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
index 0d069126294..1fcc6a95563 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
+++ b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
@@ -1 +1,2 @@
 python addin.py --unregister
+pause
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index 455f447af06..26f0bed01ce 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -162,7 +162,8 @@ hwndChk_list=[]
 
 global search_text
 search_text='search_text'
-
+global partner_ref
+partner_ref = ''
 global name
 name=''
 global email
@@ -774,13 +775,6 @@ def CreateContact(btnProcessor,*args):
         return
 
     partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
-    combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
-    sel = win32gui.SendMessage(combo, win32con.CB_GETCURSEL)
-
-    state_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
-    state_sel = win32gui.SendMessage(state_combo, win32con.CB_GETCURSEL)
-    coun_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    country_sel = win32gui.SendMessage(coun_combo, win32con.CB_GETCURSEL)
     name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     email = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
     office_no = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
@@ -795,6 +789,7 @@ def CreateContact(btnProcessor,*args):
         return
 
     res = {
+           'partner_id':ustr(partner),
            'name':ustr(name),
            'email':ustr(email),
            'phone':ustr(office_no),
@@ -806,37 +801,8 @@ def CreateContact(btnProcessor,*args):
            'zip':ustr(zip)
        }
 
-    fs_id = c_id = -1
-    if not state_sel == -1 :
-        try:
-            temp = NewConn.GetAllState()
-            i = -1
-            for t in temp:
-                i+=1
-                if i == state_sel:
-                    fs_id = t[0]
-                    break;
-            res ['state_id'] = fs_id
-        except Exception, e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "New Partner", flag_error)
-            pass
-    if not country_sel == -1 :
-        try:
-            temp = NewConn.GetAllCountry()
-            i = -1
-            for t in temp:
-                i+=1
-                if i == country_sel:
-                    c_id = t[0]
-                    break;
-            res ['country_id'] = c_id
-        except Exception, e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "Open Contact", flag_error)
-            pass
     try:
-        id = NewConn.CreateContact(sel, str(res))
+        id = NewConn.CreateContact(str(res))
         if not partner:
             msg="New contact created."
         else:
@@ -848,9 +814,6 @@ def CreateContact(btnProcessor,*args):
     win32ui.MessageBox(msg, "Create Contact", flag_info)
     for i in range(0,9):
         win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], '')
-    win32gui.SendMessage(combo, win32con.CB_SETCURSEL, -1 )
-    win32gui.SendMessage(state_combo, win32con.CB_SETCURSEL, -1 )
-    win32gui.SendMessage(coun_combo, win32con.CB_SETCURSEL, -1 )
     win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
 
 def SetAllText(txtProcessor,*args):
@@ -929,6 +892,8 @@ def SetDefaultContact(txtProcessor,*args):
 
     global name
     global email
+    global partner_ref
+    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1],partner_ref)
     if txtProcessor.init_done:
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
         win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
@@ -941,12 +906,9 @@ def SetDefaultContact(txtProcessor,*args):
     except Exception,e:
         pass
 
-    fs_combo = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
-    c_combo = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
-    win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, -1 )
-    win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, -1 )
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0],email)
+
     txtProcessor.init_done = True
 
 def setCheckList(groupProcessor,*args):
@@ -1043,6 +1005,8 @@ def set_search_text(dialogProcessor,*args):
 def set_name_email(dialogProcessor,*args):
     global name
     global email
+    global partner_ref
+    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], ustr(partner_ref))
     name = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[0])
     email = win32gui.GetDlgItemText(dialogProcessor.window.hwnd, dialogProcessor.other_ids[1])
 
@@ -1051,6 +1015,8 @@ def GetDefaultEmail(txtProcessor,*args):
     from win32com.client import Dispatch
     import win32con
     b = check()
+    global partner_ref
+    win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(partner_ref))
     if not b:
         return
     #Acquiring control of the text box
@@ -1070,96 +1036,67 @@ def GetDefaultEmail(txtProcessor,*args):
         win32ui.MessageBox("Error In reading email ID from Email ","Open Contact", flag_error)
         pass
     win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0, search_partner_text)
-
-    fs_combo = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[10])
-    c_combo = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[11])
-    partner_combo = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[0])
+    if search_partner_text.strip() == "":
+        search_partner_text = None
+        return
     vals = []
     #Searching the res.partner.address for contact based on Sender Mail ID.
     vals = NewConn.SearchPartnerDetail(search_partner_text)
     #If no user Found.
     if vals == None:
-        for i in range(1,10):
+        for i in range(1,12):
             win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[i], "")
-        win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, -1 )
-        win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, -1 )
-        win32gui.SendMessage(partner_combo, win32con.CB_SETCURSEL, -1 )
         win32ui.MessageBox("No matching records found for  : "+str(search_partner)+".","Open Contact", flag_excl)
         return
     else:
         #If user Found than Setting the Value for the contact in fields.
-        for i in range(1,10):
+        for i in range(1,12):
             win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[i], "")
-        win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, -1 )
-        win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, -1 )
-        win32gui.SendMessage(partner_combo, win32con.CB_SETCURSEL, -1 )
 
         for val in vals:
-
             if val[0] == 'partner_id':
-                    temp = list (NewConn.GetPartners())
-                    i = -1
-                    for t in temp:
-                        i+=1
-                        if t[1] == val[1][1] :
-                            win32gui.SendMessage(partner_combo, win32con.CB_SETCURSEL, i )
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], ustr(val[1][1]))
+
             if val[0] == 'name' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[1], ustr(val[1]))
 
             if val[0] == 'street' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2], ustr(val[1]))
 
             if val[0] == 'street2' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3], ustr(val[1]))
 
             if val[0] == 'zip' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[9], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[9], ustr(val[1]))
 
             if val[0] == 'city' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[4], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[4], ustr(val[1]))
 
             if val[0] == 'state_id' and val[1] != False :
-                id = i = -1
-                temp = list(NewConn.GetAllState())
-                for t in temp:
-                    i+=1
-                    if str(t[1]) ==  str(val[1][1]):
-                        id = i
-                        break;
-                sel = win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, id )
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10], ustr(val[1][1]))
 
             if val[0] == 'country_id' and val[1] != False :
-                id = i = -1
-                temp = list(NewConn.GetAllCountry())
-                for t in temp:
-                    i+=1
-                    if str(t[1]) ==  str(val[1][1]):
-                        id = i
-                        break;
-                sel = win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, id )
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(val[1][1]))
 
             if val[0] == 'phone' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[5], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[5], ustr(val[1]))
 
             if val[0] == 'mobile' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[6], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[6], ustr(val[1]))
 
             if val[0] == 'fax' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[7], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[7], ustr(val[1]))
 
             if val[0] == 'email' and val[1] != False :
-                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[8], str(val[1]))
+                win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[8], ustr(val[1]))
 
     txtProcessor.init_done=True
 
 def SearchPartner(btnProcessor,*args):
     b = check()
+    global partner_ref
     if not b:
         return
-    #hwnd For the List box
-    fs_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    c_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[12])
-    partner_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
     try :
         search_partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
         if not search_partner:
@@ -1170,79 +1107,51 @@ def SearchPartner(btnProcessor,*args):
         vals = NewConn.SearchPartnerDetail(search_partner)
         #if contact not found resetting all field to blank
         if vals == None:
-            for i in range(2,11):
+            for i in range(1,13):
                 win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], "")
-            win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, -1 )
-            win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, -1 )
-            win32gui.SendMessage(partner_combo, win32con.CB_SETCURSEL, -1 )
             win32ui.MessageBox("No matching records found for  : "+str(search_partner)+".","Open Contact", flag_excl)
             win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], "<enter new search>")
             return
         #if contact found than setting the values for the contact.
         else:
-            for i in range(2,11):
+            for i in range(1,13):
                 win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[i], "")
-            win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, -1 )
-            win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, -1 )
-            win32gui.SendMessage(partner_combo, win32con.CB_SETCURSEL, -1 )
             for val in vals:
                 if val[0] == 'partner_id':
-                    #Finding the partner index in list and setting it.
-                    temp = list (NewConn.GetPartners())
-                    i = -1
-                    for t in temp:
-                        i+=1
-                        if t[1] == val[1][1] :
-                            win32gui.SendMessage(partner_combo, win32con.CB_SETCURSEL, i )
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1], ustr(val[1][1]))
 
                 if val[0] == 'name' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2], ustr(val[1]))
 
                 if val[0] == 'street' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3], ustr(val[1]))
 
                 if val[0] == 'street2' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[4], ustr(val[1]))
 
                 if val[0] == 'zip' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10], ustr(val[1]))
 
                 if val[0] == 'city' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[5], ustr(val[1]))
 
                 if val[0] == 'state_id' and val[1] != False :
-                    #Finding the state index in list and setting it.
-                    id = i = -1
-                    temp = list(NewConn.GetAllState())
-                    for t in temp:
-                        i+=1
-                        if str(t[1]) ==  str(val[1][1]):
-                            id = i
-                            break;
-                    sel = win32gui.SendMessage(fs_combo, win32con.CB_SETCURSEL, id )
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11], ustr(val[1][1]))
 
                 if val[0] == 'country_id' and val[1] != False :
-                    #Finding the country index in list and setting it.
-                    id = i = -1
-                    temp = list(NewConn.GetAllCountry())
-                    for t in temp:
-                        i+=1
-                        if str(t[1]) ==  str(val[1][1]):
-                            id = i
-                            break;
-                    sel = win32gui.SendMessage(c_combo, win32con.CB_SETCURSEL, id )
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[12], ustr(val[1][1]))
 
                 if val[0] == 'phone' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[6], ustr(val[1]))
 
                 if val[0] == 'mobile' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[7], ustr(val[1]))
 
                 if val[0] == 'fax' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[8], ustr(val[1]))
 
                 if val[0] == 'email' and val[1] != False :
-                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9], str(val[1]))
+                    win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9], ustr(val[1]))
 
             win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0], "<Enter  new search>")
     except Exception,e:
@@ -1253,6 +1162,7 @@ def SearchPartner(btnProcessor,*args):
 def WritePartner(btnProcessor,*args):
     new_vals=[]
     #Reading new value of the fields.
+    partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     contect_name = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
     street = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
     street2 = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[3])
@@ -1262,70 +1172,14 @@ def WritePartner(btnProcessor,*args):
     fax = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[9])
     email = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[10])
     zip = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[11])
-    country_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[6])
-    country_sel = win32gui.SendMessage(country_combo, win32con.CB_GETCURSEL)
-    state_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[5])
-    state_sel = win32gui.SendMessage(state_combo, win32con.CB_GETCURSEL)
-    partner_combo = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
-    partner_sel = win32gui.SendMessage(partner_combo, win32con.CB_GETCURSEL)
-    #Checking that record not being saved without name or Partner
     if contect_name.strip() == "":
         win32ui.MessageBox("Please enter partner Contact Name name.", "Open Contact", flag_excl)
         return
-    if partner_sel < 1:
-        win32ui.MessageBox("Please Select Partner From list.", "Open Contact", flag_excl)
-        return
-    fs_id = c_id = p_id = -1
-    #Finding the partner index in list finding it record ID.
-    if not partner_sel < 0 :
-        try:
-            temp = NewConn.GetPartners()
-            i = -1
-            for t in temp:
-                i+=1
-                if i == partner_sel:
-                    p_id = t[0]
-                    break;
-        except Exception, e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "Open Contact", flag_error)
-            pass
-    #Finding the State index in list finding it record ID.
-    if not state_sel == -1 :
-        try:
-            temp = NewConn.GetAllState()
-            i = -1
-            for t in temp:
-                i+=1
-                if i == state_sel:
-                    fs_id = t[0]
-                    break;
-        except Exception, e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "Open Contact", flag_error)
-            pass
-    #Finding the country index in list finding it record ID.
-    if not country_sel == -1 :
-        try:
-            temp = NewConn.GetAllCountry()
-            i = -1
-            for t in temp:
-                i+=1
-                if i == country_sel:
-                    c_id = t[0]
-                    break;
-        except Exception, e:
-            msg = getMessage(e)
-            win32ui.MessageBox(msg, "Open Contact", flag_error)
-            pass
-    # Creating a list to write the values to the OpenERP
-    new_vals.append(['partner_id',p_id])
+    new_vals.append(['partner',partner])
     new_vals.append(['name',contect_name])
     new_vals.append(['street',street])
     new_vals.append(['street2',street2])
     new_vals.append(['city',city])
-    new_vals.append(['state_id',fs_id])
-    new_vals.append(['country_id',c_id])
     new_vals.append(['phone',phone])
     new_vals.append(['mobile',mobile])
     new_vals.append(['email',email])
@@ -1346,6 +1200,80 @@ def WritePartner(btnProcessor,*args):
     elif flag == -1:
         win32ui.MessageBox("Contact can not be Save.\nFirst select contact using Search.","Open Contact", flag_info)
 
+def SetPartnerNameColumn(listProcessor,*args):
+    hwndList = listProcessor.GetControl()
+    child_ex_style = win32gui.SendMessage(hwndList, commctrl.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0)
+    child_ex_style |= commctrl.LVS_EX_FULLROWSELECT
+    win32gui.SendMessage(hwndList, commctrl.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, child_ex_style)
+
+    # set header row
+    lvc =  LVCOLUMN(
+                    mask = commctrl.LVCF_FMT | commctrl.LVCF_WIDTH | \
+                    commctrl.LVCF_TEXT | commctrl.LVCF_SUBITEM
+                    )
+    lvc.fmt = commctrl.LVCFMT_LEFT
+    lvc.iSubItem = 1
+    lvc.text = "Partner Name"
+    lvc.cx = 275
+    win32gui.SendMessage(hwndList, commctrl.LVM_INSERTCOLUMN, 0, lvc.toparam())
+    listProcessor.init_done = True
+
+def SelectPartnerFromList(btnProcessor,*args):
+
+    hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+    sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
+    sel_text = ''
+    if sel_count == 1:
+        sel=-1
+        for i in range(0,sel_count):
+            sel = win32gui.SendMessage(hwndList, commctrl.LVM_GETNEXTITEM, sel, commctrl.LVNI_SELECTED)
+            buf,extra = win32gui_struct.EmptyLVITEM(1, 0)
+            size = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMTEXT, sel, buf)
+            sel_text = ''
+            for n in extra:
+                nombre = n.tostring()
+                sel_text = nombre[0:size]
+        global partner_ref
+        if str(sel_text).strip() == "":
+            win32ui.MessageBox("Invalid Partner Selected.","Search Partner")
+            return
+        try:
+            partner_ref = str(sel_text)
+        except Exception,e:
+            pass
+        win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
+        return
+    elif sel_count < 1:
+        win32ui.MessageBox("You should Select atleast one partner.","Search Partner")
+        return
+    else:
+        win32ui.MessageBox("Multiple Selection is not allowded.","Search Partner")
+        return
+
+def SearchPartnerList(btnProcessor,*args):
+    b = check()
+    if not b:
+        return
+    try :
+        search_partner = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
+        if not search_partner:
+            win32ui.MessageBox("Please enter Partner name to search for.", "Search Partner", flag_excl)
+            return
+        #Searching the contact.
+        hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
+        partners = list(NewConn.GetPartners(search_partner))
+        win32gui.SendMessage(hwndList, commctrl.LVM_DELETEALLITEMS)
+        if not partners:
+            win32gui.SetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[0],"<enter text to search>")
+            win32ui.MessageBox("No Partner found with name {0}.".format(search_partner),"Search Partner",flag_error)
+        for partner in partners:
+            num_items = win32gui.SendMessage(hwndList, commctrl.LVM_GETITEMCOUNT)
+            item = LVITEM(text=partner[1],iItem = num_items)
+            win32gui.SendMessage(hwndList, commctrl.LVM_INSERTITEM, 0, item.toparam())
+    except Exception,e:
+        msg = getMessage(e)
+        win32ui.MessageBox(msg, "Search Partner", flag_error)
+        pass
 
 
 dialog_map = {
@@ -1399,13 +1327,10 @@ dialog_map = {
             ),
 
             "IDD_NEW_CONTACT_DIALOG" : (
-                (PartnersComboProcessor,    "ID_PARTNER_DROPDOWNLIST", GetConn, ()),
-                (CountryComboProcessor,     "ID_COUNTRY_DROPLIST", GetConn, ()),
-                (StateComboProcessor,       "ID_FED_STATE_DROPLIST", GetConn, ()),
                 (CloseButtonProcessor,      "IDCANCEL"),
-                (CommandButtonProcessor,    "ID_CONTACT_SAVE_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_CONTACT_OFFICE_TEXT ID_CONTACT_MOBILE_TEXT ID_FAX_TEXT ID_STREET_TEXT ID_STREET2_TEXT ID_PARTNER_CITY_TEXT ID_ZIP_TEXT ID_PARTNER_DROPDOWNLIST ID_FED_STATE_DROPLIST ID_COUNTRY_DROPLIST", CreateContact, ()),
-                (TextProcessor,             "ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_FED_STATE_DROPLIST ID_COUNTRY_DROPLIST" , SetDefaultContact, ()),
-                (DialogCommand,             "ID_NEW_PARTNER_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT", "IDD_NEW_PARTNER_DIALOG", set_name_email, ()),
+                (CommandButtonProcessor,    "ID_CONTACT_SAVE_BUTTON ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_CONTACT_OFFICE_TEXT ID_CONTACT_MOBILE_TEXT ID_FAX_TEXT ID_STREET_TEXT ID_STREET2_TEXT ID_PARTNER_CITY_TEXT ID_ZIP_TEXT ID_PARTNER_TEXT", CreateContact, ()),
+                (TextProcessor,             "ID_CONTACT_NAME_TEXT ID_CONTACT_EMAIL_TEXT ID_PARTNER_TEXT" , SetDefaultContact, ()),
+                (DialogCommand,             "ID_NEW_PARTNER_BUTTON", "IDD_SELECT_PARTNER"),
             ),
 
             "IDD_NEW_PARTNER_DIALOG" : (
@@ -1414,14 +1339,18 @@ dialog_map = {
             ),
 
             "IDD_VIEW_PARTNER_DIALOG" : (
-                (PartnersComboProcessor,    "ID_PARTNER_DROPLIST", GetConn, ()),
-                (StateComboProcessor,       "ID_ALL_STATE_DROPDOWNLIST", GetConn, ()),
-                (CountryComboProcessor,     "ID_ALL_COUNTRY_DROPDOWNLIST", GetConn, ()),
-                (TextProcessor,             "IDET_SEARCH_PARTNER ID_PARTNER_DROPLIST IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP ID_ALL_STATE_DROPDOWNLIST ID_ALL_COUNTRY_DROPDOWNLIST", GetDefaultEmail, ()),
-                (CommandButtonProcessor,    "IDPB_SEARCH_PARTNER IDET_SEARCH_PARTNER ID_PARTNER_DROPLIST IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP ID_ALL_STATE_DROPDOWNLIST ID_ALL_COUNTRY_DROPDOWNLIST", SearchPartner, ()),
-                (CommandButtonProcessor,    "IDPB_WRITE_CHANGES ID_PARTNER_DROPLIST IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY ID_ALL_STATE_DROPDOWNLIST ID_ALL_COUNTRY_DROPDOWNLIST IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP", WritePartner, ()),
+                (TextProcessor,             "IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", GetDefaultEmail, ()),
+                (CommandButtonProcessor,    "IDPB_SEARCH_PARTNER IDET_SEARCH_PARTNER IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP IDET_PARTNER_STATE IDET_PARTNER_COUNTRY", SearchPartner, ()),
+                (CommandButtonProcessor,    "IDPB_WRITE_CHANGES IDET_PARTNER IDET_PARTNER_CONTACT_NAME IDET_PARTNER_STREET IDET_PARTNER_STREET2 IDET_PARTNER_CITY IDET_PARTNER_STATE IDET_PARTNER_COUNTRY IDET_PARTNER_OFFICENO IDET_PARTNER_MOBILENO IDET_PARTNER_EMAIL IDET_PARTNER_FAX IDET_ZIP", WritePartner, ()),
                 (CloseButtonProcessor,      "IDCANCEL"),
-                (DialogCommand,             "ID_NEW_PART_BUTTON", "IDD_NEW_PARTNER_DIALOG" ),
+                (DialogCommand,             "ID_NEW_PART_BUTTON", "IDD_SELECT_PARTNER" ),
                 (DialogCommand,             "IDPB_NEWPARTNER_BUTTON" , "IDD_NEW_CONTACT_DIALOG")
             ),
+            "IDD_SELECT_PARTNER" : (
+                (CloseButtonProcessor,      "IDCANCEL"),
+                (ListBoxProcessor,          "IDC_LIST_PARTNER" ,SetPartnerNameColumn, ()),
+                (CommandButtonProcessor,    "IDPB_PARTNER_SEARCH IDET_PARTNER_SEARCH_NAME IDC_LIST_PARTNER", SearchPartnerList,()),
+                (CommandButtonProcessor,    "IDPB_SELECT_PARTNER IDC_LIST_PARTNER IDD_SELECT_PARTNER" , SelectPartnerFromList,()),
+                (DialogCommand,             "IDPB_CREATE_NEW_PARTNER" , "IDD_NEW_PARTNER_DIALOG")
+            ),
 }
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
index 8979221b00f..bb028c0da90 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
@@ -156,6 +156,9 @@
 #define IDPB_WRITE_CHANGES				2059
 #define ID_ALL_STATE_DROPDOWNLIST		2060
 #define ID_ALL_COUNTRY_DROPDOWNLIST		2061
+#define IDET_PARTNER_STATE				2062
+#define IDET_PARTNER_COUNTRY			2063
+#define IDET_PARTNER					2064
 //
 #define ID_STREET_TEXT					2062
 #define ID_STREET2_TEXT					2063
@@ -167,6 +170,13 @@
 #define ID_PARTNER_DROPLIST				2069
 #define ID_NEW_PART_BUTTON				2070
 #define IDPB_NEWPARTNER_BUTTON			2071
+#define IDD_SELECT_PARTNER				2073
+#define IDC_LIST_PARTNER				2072
+#define IDPB_SELECT_PARTNER				2075
+#define IDET_PARTNER_SEARCH_NAME		2076
+#define IDPB_PARTNER_SEARCH				2077
+#define IDPB_CREATE_NEW_PARTNER			2078
+#define ID_PARTNER_TEXT					2079
 // Next default values for new objects
 //
 #ifdef APSTUDIO_INVOKED
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index 81bf5d8b1e6..3dac98b5fb0 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,11 +1,11 @@
 #C:\Documents and Settings\TinyERP\Desktop\OpenERP-Outlook-PlugIn\openerp-outlook-plugin\dialogs\resources\dialogs.py
 #This is a generated file. Please edit C:\Documents and Settings\TinyERP\Desktop\OpenERP-Outlook-PlugIn\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
-_rc_size_=11409
-_rc_mtime_=1285078254
+_rc_size_=11883
+_rc_mtime_=1285738756
 class FakeParser:
-	dialogs = {'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Partner ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [133, '', 2069, (70, 42, 200, 80), 1344339971], [128, 'New Partner', 2070, (280, 41, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [133, '', 2060, (76, 153, 100, 50), 1344339971], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [133, '', 2061, (76, 168, 100, 50), 1344339971], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 190), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [133, '', 2032, (70, 18, 200, 80), 1344339971], [128, 'New Partner', 2033, (280, 17, 55, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 108, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 123, 40, 17), 1342177280], [133, '', 2064, (76, 122, 100, 80), 1344339971], [130, 'Country : ', -1, (18, 137, 40, 17), 1342177280], [133, '', 2065, (76, 136, 100, 80), 1344339971], [128, 'Communication ', 2024, (188, 35, 150, 125), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 170, 45, 14), 1342242816], [128, 'Save', 40009, (240, 170, 45, 14), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, ' Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]]}
-	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2057, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDC_FOLDER_HAM': 1083, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, '_APS_NEXT_RESOURCE_VALUE': 128, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDC_BUT_RESET': 1073, 'IDET_PARTNER_CONTACT_NAME': 2046, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'IDD_SYNC': 40002, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'ID_CONTACT_NAME_TEXT': 40005, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'ID_SAVE_PARTNER_BUTTON': 2035, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'ID_SEARCH_TEXT': 40003, 'ID_SEARCH': 40004, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012}
-	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 1083: 'IDC_FOLDER_HAM', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'ID_STREET_TEXT', 2063: 'ID_STREET2_TEXT', 2064: 'ID_FED_STATE_DROPLIST', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 40004: 'ID_SEARCH', 2046: 'IDET_PARTNER_CONTACT_NAME', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
+	dialogs = {'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 200, 12), 1350568064], [128, 'Search Partner', 2070, (280, 41, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 100, 12), 1350568064], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 100, 12), 1350568064], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 150), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 200, 12), 1350568064], [128, 'Search Partner', 2033, (280, 17, 60, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 90), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [128, 'Communication ', 2024, (188, 35, 150, 90), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 130, 45, 14), 1342242816], [128, 'Save', 40009, (240, 130, 45, 14), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (130, 230, 40, 14), 1342242816], [128, 'Cancel', 2, (175, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]]}
+	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDC_FOLDER_HAM': 1083, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, '_APS_NEXT_RESOURCE_VALUE': 128, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'IDET_PARTNER_CONTACT_NAME': 2046, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'ID_CONTACT_NAME_TEXT': 40005, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'ID_SEARCH_TEXT': 40003, 'ID_SEARCH': 40004, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012}
+	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 1083: 'IDC_FOLDER_HAM', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 40004: 'ID_SEARCH', 2046: 'IDET_PARTNER_CONTACT_NAME', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
 def ParseDialogs(s):
 	return FakeParser()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
index cc9844807c6..fb060ecdab3 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
@@ -111,7 +111,7 @@ EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Push to OpenERP"
 FONT 8, "Tahoma", 1000, 0, 0x0
 BEGIN
-	GROUPBOX        " Link to an Existing Documents ", IDC_STATIC_GROUP, 8,5,250,290,WS_TABSTOP
+	GROUPBOX        "Link to an Existing Documents ", IDC_STATIC_GROUP, 8,5,250,290,WS_TABSTOP
 	LTEXT           "Search for : ",IDC_STATIC,15,17,40,12
 	EDITTEXT        ID_SEARCH_TEXT,60,15,120,12,ES_AUTOHSCROLL | WS_TABSTOP// left top width height
     PUSHBUTTON   	"Search",ID_SEARCH,187,15,40,14,WS_TABSTOP
@@ -131,7 +131,7 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,385,300,60,14,WS_TABSTOP
 END
 
-IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 190
+IDD_NEW_CONTACT_DIALOG DIALOGEX 0, 0, 350, 150
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Create a New Contact"
@@ -139,26 +139,23 @@ FONT 8, "Tahoma", 1000, 0, 0x0
 BEGIN
 
 	LTEXT           "Select Partner : ",IDC_STATIC,13,20,50,17
-	COMBOBOX        ID_PARTNER_DROPDOWNLIST, 70, 18, 200, 80 ,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-	PUSHBUTTON   	"New Partner",ID_NEW_PARTNER_BUTTON,280,17,55,14, WS_TABSTOP
+	EDITTEXT        ID_PARTNER_TEXT, 70, 18, 200, 12 , ES_AUTOHSCROLL |ES_READONLY
+	PUSHBUTTON   	"Search Partner",ID_NEW_PARTNER_BUTTON,280,17,60,14, WS_TABSTOP
 
-    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,35,175,125
+    GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,35,175,90
 	LTEXT           "Contact Name : ",IDC_STATIC, 18, 53, 100, 17
 	EDITTEXT        ID_CONTACT_NAME_TEXT, 76, 52, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
 	LTEXT           "Street : ",IDC_STATIC, 18, 67, 40, 17
 	EDITTEXT        ID_STREET_TEXT, 76, 66, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
 	LTEXT           "Street2 : ",IDC_STATIC, 18, 81, 40, 17
 	EDITTEXT        ID_STREET2_TEXT, 76, 80, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Zip : ",IDC_STATIC,18, 94, 50, 17
+    LTEXT           "Zip : ",IDC_STATIC, 18, 94, 50, 17
     EDITTEXT		ID_ZIP_TEXT,76, 93, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "City : ",IDC_STATIC,18,108,50,17
+    LTEXT           "City : ",IDC_STATIC, 18,106, 50, 17
     EDITTEXT		ID_PARTNER_CITY_TEXT,76,107,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-	LTEXT           "Fed. State : ",IDC_STATIC, 18, 123, 40, 17
-	COMBOBOX        ID_FED_STATE_DROPLIST, 76, 122, 100, 80,CBS_DROPDOWNLIST |WS_VSCROLL | WS_TABSTOP
-	LTEXT           "Country : ",IDC_STATIC, 18, 137, 40, 17
-	COMBOBOX        ID_COUNTRY_DROPLIST, 76, 136, 100, 80,CBS_DROPDOWNLIST |WS_VSCROLL | WS_TABSTOP
 
-    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 35, 150, 125
+
+    GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 35, 150, 90
 	LTEXT           "Office : ",IDC_STATIC,194, 53, 30, 17
 	EDITTEXT        ID_CONTACT_OFFICE_TEXT, 224, 52, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
 	LTEXT           "Mobile : ",IDC_STATIC,194, 67, 30, 17
@@ -168,8 +165,8 @@ BEGIN
 	LTEXT           "Email  : ",IDC_STATIC, 194, 95, 30, 17
 	EDITTEXT        ID_CONTACT_EMAIL_TEXT, 224, 94, 100, 12,ES_AUTOHSCROLL | WS_TABSTOP
 
-	PUSHBUTTON   	"Cancel",IDCANCEL,290,170,45,14, WS_TABSTOP
-	PUSHBUTTON   	"Save",ID_CONTACT_SAVE_BUTTON,240,170,45,14, WS_TABSTOP
+	PUSHBUTTON   	"Cancel",IDCANCEL,290,130,45,14, WS_TABSTOP
+	PUSHBUTTON   	"Save",ID_CONTACT_SAVE_BUTTON,240,130,45,14, WS_TABSTOP
 END
 
 IDD_NEW_PARTNER_DIALOG DIALOGEX 0, 0, 140,40
@@ -192,11 +189,11 @@ FONT 8, "Tahoma", 400, 0, 0x0
 BEGIN
 	LTEXT           "Email ID : ",IDC_STATIC,32,17,40,12
 	EDITTEXT        IDET_SEARCH_PARTNER, 70, 15, 200, 12, ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON   	"Search Partner ",IDPB_SEARCH_PARTNER,280,15,60,14,WS_TABSTOP
+    PUSHBUTTON   	"Search Contact ",IDPB_SEARCH_PARTNER,280,15,60,14,WS_TABSTOP
 
     LTEXT           "Partner Name : ",IDC_STATIC,13,42,50,17
-	COMBOBOX        ID_PARTNER_DROPLIST, 70, 42, 200, 80 ,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-	PUSHBUTTON   	"New Partner",ID_NEW_PART_BUTTON,280,41,60,14, WS_TABSTOP
+	EDITTEXT		IDET_PARTNER,70, 42, 200, 12,ES_AUTOHSCROLL |ES_READONLY
+	PUSHBUTTON   	"Search Partner",ID_NEW_PART_BUTTON,280,41,60,14, WS_TABSTOP
 
     GROUPBOX		"Postal Address ", IDC_STATIC_GROUP,10,65,175,125
     LTEXT           "Contact Name : ",IDC_STATIC,18,83,50,17
@@ -210,9 +207,9 @@ BEGIN
     LTEXT           "City : ",IDC_STATIC,18,140,50,17
     EDITTEXT		IDET_PARTNER_CITY,76,139,100,12,ES_AUTOHSCROLL | WS_TABSTOP
     LTEXT           "Fed. State : ",IDC_STATIC,18,154,50,17
-    COMBOBOX        ID_ALL_STATE_DROPDOWNLIST, 76, 153, 100, 50,CBS_DROPDOWNLIST |WS_VSCROLL | WS_TABSTOP
+    EDITTEXT		IDET_PARTNER_STATE, 76, 153, 100, 12,ES_AUTOHSCROLL |ES_READONLY
 	LTEXT           "Country :",IDC_STATIC, 18, 169, 35, 17
-    COMBOBOX        ID_ALL_COUNTRY_DROPDOWNLIST, 76, 168,100,50,CBS_DROPDOWNLIST |WS_VSCROLL | WS_TABSTOP
+    EDITTEXT		IDET_PARTNER_COUNTRY, 76, 168, 100, 12,ES_AUTOHSCROLL |ES_READONLY
 
     GROUPBOX		"Communication ", IDC_STATIC_GROUP, 188, 65, 152, 125
     LTEXT           "Phone : ",IDC_STATIC, 194, 83, 30, 17
@@ -228,3 +225,22 @@ BEGIN
 	PUSHBUTTON 		"Save", IDPB_WRITE_CHANGES, 213, 195, 60, 14, WS_TABSTOP
     PUSHBUTTON      "Cancel", IDCANCEL, 281, 195, 60, 14, WS_TABSTOP
 END
+
+IDD_SELECT_PARTNER DIALOGEX 0, 0, 220, 250
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "Search Partner"
+FONT 8, "Tahoma", 400, 0, 0x0
+BEGIN
+
+    LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
+    EDITTEXT		IDET_PARTNER_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
+    PUSHBUTTON 		"Search", IDPB_PARTNER_SEARCH, 160, 10, 50, 14, WS_TABSTOP
+
+    CONTROL         "List1",IDC_LIST_PARTNER,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
+            		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
+	PUSHBUTTON 		"Create New Partner", IDPB_CREATE_NEW_PARTNER, 10, 230, 100, 14, WS_TABSTOP
+	PUSHBUTTON 		"Select", IDPB_SELECT_PARTNER, 130, 230, 40, 14, WS_TABSTOP
+    PUSHBUTTON      "Cancel", IDCANCEL, 175, 230, 40, 14, WS_TABSTOP
+END
+
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 9a3efc6fa7f..45fdeaa5d82 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -209,12 +209,12 @@ class XMLRpcConn(object):
         obj_list = [ustr(item['name']).encode('iso-8859-1') for item in objects]
         return obj_list
 
-    def GetPartners(self):
+    def GetPartners(self, search_partner=''):
+        import win32ui
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
         ids=[]
         obj_list=[]
-
-        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',[])
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',[('name','ilike',ustr(search_partner))])
         if ids:
             ids.sort()
             obj_list.append((-999, ustr('')))
@@ -302,13 +302,13 @@ class XMLRpcConn(object):
             result[obj].update({obj_id: attachment_ids})
         return result
 
-    def CreateContact(self, sel=None, res=None):
+    def CreateContact(self, res=None):
+        import win32ui
         res=eval(str(res))
-
-        self.partner_id_list=eval(str(self.partner_id_list))
-        if self.partner_id_list.get(sel,-999) != -999:
-            res['partner_id'] = self.partner_id_list[sel]
+        partner = res['partner_id']
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
+        res.update({'partner_id' : partner_id[0]})
         id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner.address','create',res)
         return id
 
@@ -339,12 +339,16 @@ class XMLRpcConn(object):
         flag = -1
         new_dict = dict(new_vals)
         email=new_dict['email']
+        partner = new_dict['partner']
         conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
         address_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(email))])
         if not address_id:
             return flag
         address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','state_id','country_id'])
-        vals_res_address={ 'name' : new_dict['name'],
+        vals_res_address={
+                           'partner_id' : partner_id[0],
+                           'name' : new_dict['name'],
                            'street':new_dict['street'],
                            'street2' : new_dict['street2'],
                            'city' : new_dict['city'],
@@ -353,12 +357,6 @@ class XMLRpcConn(object):
                            'fax' : new_dict['fax'],
                            'zip' : new_dict['zip'],
                          }
-        if new_dict['partner_id'] != -1:
-            vals_res_address['partner_id'] = new_dict['partner_id']
-        if new_dict['state_id'] != -1:
-            vals_res_address['state_id'] = new_dict['state_id']
-        if new_dict['country_id'] != -1:
-            vals_res_address['country_id'] = new_dict['country_id']
         temp = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'write', address_id, vals_res_address)
         if temp:
             flag=1
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index ad466b12522..1c23a27acd1 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -67,12 +67,11 @@ Main features :
         'report/report_pos_order_view.xml',
         'report/report_cash_register_view.xml',
         'pos_sequence.xml',
-        'pos_data.xml',
         'pos_workflow.xml',
         'statement_view.xml',
         'statement_report.xml',
     ],
-    'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
+    'demo_xml': ['pos_demo.xml','singer_statement_demo.xml'],
     'test':['test/pos_test.yml',
             'test/pos_report.yml',
     ],
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
deleted file mode 100644
index 9ae66800ff9..00000000000
--- a/addons/point_of_sale/multi_company_demo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="0">
-
-    </data>
-</openerp>
-
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
deleted file mode 100644
index cc8d30d080d..00000000000
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    </data>
-</openerp>
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 0d6ab5f2b33..3132367d8bf 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -25,8 +25,6 @@ from osv import fields, osv
 from mx import DateTime
 from tools.translate import _
 from decimal import Decimal
-import tools
-import re
 import decimal_precision as dp
 
 class pos_config_journal(osv.osv):
@@ -114,18 +112,18 @@ class pos_order(osv.osv):
         @return: Dictionary of values """
 
         res = {}
-        pay_obj = self.pool.get('account.bank.statement')
-        stat_obj_line = self.pool.get('account.bank.statement.line')
-        tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+            cr.execute("SELECT date_payment FROM pos_order WHERE id=%s", (order.id,))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
                 res[order.id]=date_p
                 return res
-            cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
+            cr.execute(" SELECT max(l.date) "
+                        " FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o "
+                        " WHERE i.move_id=m.id AND l.move_id=m.id AND l.reconcile_id=r.id AND o.id=%s AND o.invoice_id=i.id",
+                        (order.id,))
             val=cr.fetchone()
             val= val and val[0] or None
             if val:
@@ -138,11 +136,9 @@ class pos_order(osv.osv):
         @return: Dictionary of values """
 
         res = {}
-        pay_obj = self.pool.get('pos.payment')
-        tot =0.0
         val=None
         for order in self.browse(cr, uid, ids):
-            cr.execute("select date_validation from pos_order where id=%d"%(order.id))
+            cr.execute("SELECT date_validation FROM pos_order WHERE id=%s", (order.id,))
             date_p=cr.fetchone()
             date_p=date_p and date_p[0] or None
             if date_p:
@@ -153,7 +149,7 @@ class pos_order(osv.osv):
                 if line.discount > discount_allowed:
                     return {order.id: None }
             if order.amount_paid == order.amount_total and not date_p:
-                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
+                cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id=%s", (order.id,))
                 val=cr.fetchone()
                 val=val and val[0] or None
             if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
@@ -215,7 +211,6 @@ class pos_order(osv.osv):
         """ To get  Shop  for this order"
         @return: Shop id  """
 
-        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
         res = self.pool.get('sale.shop').search(cr, uid, [])
         if res:
             return res[0]
@@ -242,23 +237,21 @@ class pos_order(osv.osv):
         """ Changed the Validation state of order
         @return: State  """
 
-        flag=False
-        res_company = self.pool.get('res.company')
         res_obj = self.pool.get('res.users')
         company_disc=self.browse(cr,uid,ids)
         if not company_disc:
             comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
         else:
             comp= company_disc[0] and company_disc[0].company_id and  company_disc[0].company_id.company_discount  or 0.0
-        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s"%(ids[0],comp))
+        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s", (ids[0],comp))
         res=cr.fetchone()
-        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s"%(ids[0],comp))
+        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s", (ids[0],comp))
         res2=cr.fetchone()
-        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
+        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s ", (ids[0],))
         res3=cr.fetchall()
         list_jrnl=[]
         for r in res3:
-            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))
+            cr.execute("select id from account_journal where name= '%s' and special_journal='t'", (r[0],))
             res3=cr.fetchone()
             is_special=res3 and res3[0] or None
             if is_special:
@@ -489,7 +482,7 @@ class pos_order(osv.osv):
                         continue
                     prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
                     val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
-                    cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
+                    cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id=%s", (order.shop_id.warehouse_id.id,))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
                     stock_dest_id = val.id
@@ -540,7 +533,7 @@ class pos_order(osv.osv):
         res_obj = self.pool.get('res.company')
         try:
             part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
-        except Exception, e:
+        except Exception:
             raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
         if part_company:
             raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
@@ -559,12 +552,10 @@ class pos_order(osv.osv):
 
         """Create a new payment for the order"""
 
-        res_obj = self.pool.get('res.company')
         statement_obj= self.pool.get('account.bank.statement')        
         statementl_obj = self.pool.get('account.bank.statement.line')
         prod_obj = self.pool.get('product.product')
         property_obj=self.pool.get('ir.property')
-        flag=''
         curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id
         curr_company=curr_c.id
         order = self.browse(cr, uid, order_id, context)
@@ -600,7 +591,7 @@ class pos_order(osv.osv):
         args['statement_id']= statement_id
         args['pos_statement_id']= order_id
         args['journal_id']= data['journal']
-        statement_line_id = statementl_obj.create(cr, uid, args)
+        statementl_obj.create(cr, uid, args)
         ids_new.append(statement_id)
 
         wf_service = netsvc.LocalService("workflow")
@@ -661,14 +652,12 @@ class pos_order(osv.osv):
     def action_invoice(self, cr, uid, ids, context=None):
         """Create a invoice of order  """
 
-        res_obj = self.pool.get('res.company')
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         product_obj= self.pool.get('product.product')
         inv_ids = []
 
         for order in self.pool.get('pos.order').browse(cr, uid, ids, context):
-            curr_c = order.user_salesman_id.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -894,21 +883,12 @@ class pos_order(osv.osv):
                 raise  osv.except_osv(_('Error !'),
                     _('There is no receivable account defined for this journal:'\
                     ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
-            am=0.0
             for payment in order.statement_ids:
-                am+=payment.amount
-
-                if am > 0:
-                    payment_account = \
-                        payment.statement_id.journal_id.default_debit_account_id.id
-                else:
-                    payment_account = \
-                        payment.statement_id.journal_id.default_credit_account_id.id
 
                 # Create one entry for the payment
                 if payment.is_acc:
                     continue
-                payment_move_id = account_move_obj.create(cr, uid, {
+                account_move_obj.create(cr, uid, {
                     'journal_id': payment.statement_id.journal_id.id,
                     'period_id': period,
                 }, context=context)
@@ -1022,7 +1002,7 @@ class pos_order_line(osv.osv):
     def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context):
         res = dict.fromkeys(ids, 0.0)
         account_tax_obj = self.pool.get('account.tax')
-        prices = self.price_by_product_multi(cr, uid, ids)
+        self.price_by_product_multi(cr, uid, ids)
         for line in self.browse(cr, uid, ids):
             tax_amount = 0.0
             taxes = [t for t in line.product_id.taxes_id]
@@ -1031,7 +1011,6 @@ class pos_order_line(osv.osv):
             computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
             for tax in computed_taxes:
                 tax_amount += tax['amount']
-            price = prices[line.id]
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
@@ -1042,9 +1021,8 @@ class pos_order_line(osv.osv):
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
         res = {}
 
-        prices = self.price_by_product_multi(cr, uid, ids)
+        self.price_by_product_multi(cr, uid, ids)
         for line in self.browse(cr, uid, ids):
-            price = prices[line.id]
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
@@ -1056,11 +1034,10 @@ class pos_order_line(osv.osv):
 
         account_tax_obj = self.pool.get('account.tax')
 
-        prices = self.price_by_product_multi(cr, uid, ids)
+        self.price_by_product_multi(cr, uid, ids)
         for line in self.browse(cr, uid, ids):
             for f in field_names:
                 if f == 'price_subtotal':
-                    price = prices[line.id]
                     if line.discount != 0.0:
                         res[line.id][f] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
                     else:
@@ -1073,7 +1050,6 @@ class pos_order_line(osv.osv):
                     computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
                     for tax in computed_taxes:
                         tax_amount += tax['amount']
-                    price = prices[line.id]
                     if line.discount!=0.0:
                         res[line.id][f] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
                     else:
@@ -1097,8 +1073,6 @@ class pos_order_line(osv.osv):
         for line in lines:
             pricelist = line.order_id.pricelist_id.id
             product_id = line.product_id
-            qty = line.qty or 0
-            partner_id = line.order_id.partner_id.id or False
 
             if not product_id:
                 res[line.id] = 0.0
@@ -1108,8 +1082,6 @@ class pos_order_line(osv.osv):
                     _('You have to select a pricelist in the sale form !\n' \
                     'Please set one before choosing a product.'))
 
-            uom_id = product_id.uom_po_id.id
-
             #old_price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product_id.id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
             #print "prod_id: %s, pricelist: %s, price: %s" % (product_id.id, pricelist, price)
             price = price_get_multi_res[line.product_id.id][pricelist]
@@ -1170,9 +1142,7 @@ class pos_order_line(osv.osv):
         return {'value': {'price_subtotal_incl':sub_total_discount}}
 
     def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
-        pos_order = self.pool.get('pos.order.line')
         res_obj = self.pool.get('res.users')
-        res_company = self.pool.get('res.company')
         comp = res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
         val=0.0
         if val_ded and price_u:
@@ -1184,7 +1154,6 @@ class pos_order_line(osv.osv):
     def onchange_discount(self, cr, uid,ids, discount,price,*a):
         pos_order = self.pool.get('pos.order.line')
         res_obj = self.pool.get('res.users')
-        res_company = self.pool.get('res.company')
         company_disc = pos_order.browse(cr,uid,ids)
         if discount:
             if not company_disc:
@@ -1282,7 +1251,7 @@ class pos_order_line(osv.osv):
             }
             line_id = self.write(cr, uid, order_line_id, vals)
             if not line_id:
-                raise wizard.except_wizard(_('Error'), _('Modify line failed !'))
+                raise osv.except_osv(_('Error'), _('Modify line failed !'))
             line_id = order_line_id
 
         price_line = float(qty)*float(price)
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
deleted file mode 100644
index 14710cf8f37..00000000000
--- a/addons/point_of_sale/pos_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    </data>
-</openerp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index c0f7b566879..17420b1ffe9 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -169,20 +169,6 @@
 
         </record>
 
-        <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
-            <field name="name">Uninvoiced Sales</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_pos_order_tree"/>
-            <field name="domain">[('state','not in', ('invoiced','done')),('invoice_id','=',False)]</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>
-
-        </record>
-        <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="5" />
-        <menuitem name="Uninvoiced Sales" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
         <record model="ir.actions.act_window" id="action_pos_order_accepted">
             <field name="name">Accepted Sales</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
deleted file mode 100644
index 4a321d7787f..00000000000
--- a/addons/point_of_sale/pos_wizard.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-</openerp>
diff --git a/addons/point_of_sale/posr_data.xml b/addons/point_of_sale/posr_data.xml
deleted file mode 100644
index 3ba8df59b13..00000000000
--- a/addons/point_of_sale/posr_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-    </data>
-</openerp>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
deleted file mode 100644
index 7f165742f03..00000000000
--- a/addons/point_of_sale/posrule_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-    </data>
-</openerp>
-
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index fd0eb54bc3f..d1e881befac 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -28,7 +28,7 @@ class pos_details(report_sxw.rml_parse):
     def _get_invoice(self,inv_id,user):
         res={}
         if inv_id:
-            self.cr.execute("select name from account_invoice as ac where id = %d" %(inv_id))
+            self.cr.execute("select name from account_invoice as ac where id = %s", (inv_id,))
             res = self.cr.fetchone()
             return res[0]
         else:
@@ -107,14 +107,8 @@ class pos_details(report_sxw.rml_parse):
                                     objects,
                                     0.0)
 
-    def _get_payments(self, form,user, ignore_gift=False):
+    def _get_payments(self, form,user):
         statement_line_obj = self.pool.get("account.bank.statement.line")
-        gift_journal_id = None
-        if ignore_gift:
-            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
-            if len(config_journal_ids):
-                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
-                gift_journal_id = config_journal.journal_id.id
         pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
         data={}
         if pos_ids:
@@ -162,7 +156,6 @@ class pos_details(report_sxw.rml_parse):
         res = {}
         temp={}
         list_ids = []
-        c=[]
         temp2 = 0.0
         pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
         temp.update({'name':''})
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 206c14172f9..d2bc03fd47f 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -7,7 +7,7 @@
 "access_pos_payment","pos.payment","model_pos_payment","group_pos_user",1,1,1,1
 "access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
 "access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
-"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,0,0,0
+"access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
 "access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","group_pos_user",1,0,0,0
 "access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,0,0,0
 "access_account_account_pos_user","account.account pos_user","account.model_account_account","group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index 3caf9a046c3..3862c3c97cb 100644
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -6,7 +6,7 @@
             <field name="code">VIJ</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field name="sequence_id" ref="account.sequence_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -18,7 +18,7 @@
             <field name="code">CAJ</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field name="sequence_id" ref="account.sequence_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -30,7 +30,7 @@
             <field name="code">BACJ</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field name="sequence_id" ref="account.sequence_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
deleted file mode 100644
index 2780cd0f8d0..00000000000
--- a/addons/point_of_sale/statement_data.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-    </data>
-</openerp>
diff --git a/addons/point_of_sale/statement_rules.xml b/addons/point_of_sale/statement_rules.xml
deleted file mode 100644
index 3ba8df59b13..00000000000
--- a/addons/point_of_sale/statement_rules.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-    </data>
-</openerp>
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index d17e487794e..08052356104 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -67,6 +67,15 @@
     (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
+-
+  I create a cash journal.
+-
+  !record {model: account.journal, id: account_journal_cash0}:
+    name: 'Cash Journal'
+    code: 'CSJ'
+    type: 'cash'
+    view_id: account.account_journal_bank_view
+    sequence_id: account.sequence_journal
 -
   I create a record for Bank Statement.
 -
@@ -74,7 +83,7 @@
     name: St.05/19
     balance_end_real: 0.0
     date: '2010-05-19'
-    journal_id: account.bank_journal
+    journal_id: account_journal_cash0
     period_id: account.period_5
     state: 'draft'
 -
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index f7349726033..103e49be62d 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -36,7 +36,7 @@ def get_journal(self, cr, uid, context):
 
     obj = self.pool.get('account.journal')
     statement_obj = self.pool.get('account.bank.statement')
-    cr.execute("""select DISTINCT journal_id from pos_journal_users where user_id=%d order by journal_id"""%(uid))
+    cr.execute("SELECT DISTINCT journal_id from pos_journal_users where user_id=%s order by journal_id", (uid,))
     j_ids = map(lambda x1: x1[0], cr.fetchall())
     ids = obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)])
     obj_ids= statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)])
@@ -129,7 +129,7 @@ class pos_box_entries(osv.osv_memory):
             if address_u:
                 partner_id = address_u.partner_id and address_u.partner_id.id or None
                 args['partner_id'] = partner_id
-            statement_line_id = bank_statement.create(cr, uid, args)
+            bank_statement.create(cr, uid, args)
 
             return {}
 
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index f12a0a16c99..82e47a2caa3 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -35,12 +35,11 @@ class pos_close_statement(osv.osv_memory):
              @param context: A standard dictionary
              @return : Blank Dictionary
         """
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        list_statement = []
         mod_obj = self.pool.get('ir.model.data')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
-        cr.execute("""select DISTINCT journal_id from pos_journal_users where user_id=%d order by journal_id"""%(uid))
+        cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
+                    "WHERE user_id=%s ORDER BY journal_id", (uid,))
         j_ids = map(lambda x1: x1[0], cr.fetchall())
         journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)])
         ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)])
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 0b8219d949b..67c5b125768 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -21,7 +21,6 @@
 
 from osv import osv
 from tools.translate import _
-import time
 
 class pos_open_statement(osv.osv_memory):
     _name = 'pos.open.statement'
@@ -42,7 +41,8 @@ class pos_open_statement(osv.osv_memory):
         statement_obj = self.pool.get('account.bank.statement')
         sequence_obj = self.pool.get('ir.sequence')
         journal_obj = self.pool.get('account.journal')
-        cr.execute("""select DISTINCT journal_id from pos_journal_users where user_id=%d order by journal_id"""%(uid))
+        cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
+                    "WHERE user_id=%s ORDER BY journal_id"% (uid,))
         j_ids = map(lambda x1: x1[0], cr.fetchall())
         journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)])
 
@@ -50,32 +50,17 @@ class pos_open_statement(osv.osv_memory):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
             if len(ids):
                 raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related Register.' %(journal.name)))
-
-            statement_ids = sorted(statement_obj.search(cr, uid, [('state', '=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)]))
-            if statement_ids:
-                res = []
-                statement_ids.reverse()
-                statement = statement_obj.browse(cr, uid, statement_ids[0])
-                for end_bal in statement.ending_details_ids:
-                    dct = {
-                            'pieces': end_bal.pieces,
-                            'number': end_bal.number,
-                    }
-                    res.append((0, 0, dct))
-                data['starting_details_ids'] = res
-            else:
-                data['starting_details_ids'] = statement_obj._get_cash_close_box_lines(cr, uid, [])
-
+            
             number = ''
             if journal.sequence_id:
                 number = sequence_obj.get_id(cr, uid, journal.sequence_id.id)
             else:
-                number = sequence_obj.get(cr, uid, 'account.bank.statement')
+                number = sequence_obj.get(cr, uid, 'account.cash.statement')
 
             data.update({'journal_id': journal.id,
                          'company_id': company_id,
                          'user_id': uid,
-                         'state': 'open',
+                         'state': 'draft',
                          'name': number })
             statement_id = statement_obj.create(cr, uid, data)
             statement_obj.button_open(cr, uid, [statement_id], context)
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 8330be2772c..1c92ad24132 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -42,7 +42,8 @@ class pos_make_payment(osv.osv_memory):
         active_id = context and context.get('active_id',False)
         if active_id:
             j_obj = self.pool.get('account.journal')
-            cr.execute("""select DISTINCT journal_id from pos_journal_users where user_id=%d order by journal_id"""%(uid))
+            cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
+                        "WHERE user_id=%d ORDER BY journal_id"% (uid,))
             j_ids = map(lambda x1: x1[0], cr.fetchall())
             journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)])
 
@@ -78,7 +79,7 @@ class pos_make_payment(osv.osv_memory):
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
-        res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
+        super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
         active_id = context and context.get('active_id', False) or False
         if active_id:
             order = self.pool.get('pos.order').browse(cr, uid, active_id)
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 36c92664e0b..58b4dc447cd 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-
-"""        
+   
         <!--  Select an Open Sale Order -->
         
 		<record id="view_pos_payment" model="ir.ui.view">
@@ -12,30 +10,38 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Add payment :">
-				<group colspan="4" width="600" height="220">
-				    <field name="journal"/>
-				    <field name="amount" />
-				    <field name="payment_date" />
-				    <!--field name="payment_name" /-->
-				    <field name="invoice_wanted" />
-				    <field name="num_sale" />
-				    <field name="is_acc"/>
-				    <group attrs="{'invisible':[('is_acc','=',False)]}" colspan="4" col="2">
-				    	<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"
-				    	       on_change="onchange_product_id(product_id, amount)"/>
-				    </group>
-				    <newline/>
-				    <group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="4">
-				    	<field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}"  colspan="2"/>
-				    	<field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
-				    </group>
-				    <separator colspan="4"/>
-				    <group col="4" colspan="4">
-				        <group col="2" colspan="2"/>
-	            		<button icon='gtk-stop' special="cancel"  string="Cancel" />
-						<button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
-					</group>	
-				 </group>
+				<group colspan="8" col="8" width="660" height="230">
+                    <group colspan="4" col="4" width="150">
+                        <label align="0.0" string="The register must be opened to be able to execute a payment." colspan="2"/>
+                        <separator string="" orientation="vertical" rowspan="6"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <field name="journal"/>
+                        <field name="amount"/>
+                        <field name="payment_date"/>
+                        <!--field name="payment_name" /-->
+                        <field name="invoice_wanted"/>
+                        <field name="num_sale"/>
+                        <field name="is_acc"/>
+                        <group attrs="{'invisible':[('is_acc','=',False)]}" colspan="4" col="2">
+                            <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]" on_change="onchange_product_id(product_id, amount)"/>
+                        </group>
+                        <newline/>
+                        <group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="4">
+                            <field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+                            <field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+                        </group>
+                    </group>
+                    <separator colspan="8"/>
+                    <group col="4" colspan="4"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2"/>
+                        <group col="2" colspan="2">
+                            <button icon="gtk-stop" special="cancel" string="Cancel"/>
+                            <button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
+                        </group>
+                     </group>
+                 </group>
 				</form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index dfc16e0ff96..4b975b820cb 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -123,9 +123,9 @@ class pos_return(osv.osv_memory):
                    <button icon='gtk-cancel' special="cancel"
                                string="Cancel" />
                                    <button icon='gtk-ok' name= "create_returns"
-                       string="Return goods and Exchange" type="object"/>
+                       string="Return with Echange" type="object"/>
                                    <button icon='gtk-ok' name="create_returns2"
-                        string="Return without Refund" type="object"/>
+                        string="Refund Without Exchange" type="object"/>
                 </form>"""
 
             result['arch'] = _moves_arch_lst
@@ -162,6 +162,7 @@ class pos_return(osv.osv_memory):
         stock_move_obj = self.pool.get('stock.move')
         property_obj= self.pool.get("ir.property")
         uom_obj =self. pool.get('product.uom')
+        statementl_obj = self.pool.get('account.bank.statement.line')
         wf_service = netsvc.LocalService("workflow")
         #Todo :Need to clean the code
         if active_id:
@@ -171,7 +172,9 @@ class pos_return(osv.osv_memory):
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
                 val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
-                cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+                cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
+                            "WHERE w.lot_stock_id=s.id AND w.id=%s ", 
+                            (order_id.shop_id.warehouse_id.id,))
                 res = cr.fetchone()
                 location_id = res and res[0] or None
                 stock_dest_id = val.id
@@ -185,10 +188,13 @@ class pos_return(osv.osv_memory):
                                                               'lines':[],
                                                               'statement_ids':[],
                                                               'picking_id':[]})
+                account_def = property_obj.get(cr, uid, 'property_account_payable', 'res.partner', context=context)
+                amount = 0.0
                 for line in order_id.lines:
                     if line.id:
                         try:
                             qty = data['return%s' %line.id]
+                            amount += qty * line.price_unit
                         except :
                             qty = line.qty
                         stock_move_obj.create(cr, uid, {
@@ -204,6 +210,15 @@ class pos_return(osv.osv_memory):
                             'date_planned': date_cur
                         })
                         line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
+                statementl_obj.create(cr, uid, {
+                                                'name': 'Refund %s'%order_id.name,
+                                                'statement_id': order_id.statement_ids[0].statement_id.id,
+                                                'pos_statement_id': new_order,
+                                                'date': time.strftime('%Y-%m-%d'),
+                                                'account_id': order_id.partner_id and order_id.partner_id.property_account_payable \
+                                                             and order_id.partner_id.property_account_payable.id or account_def.id,
+                                                'amount': -amount,
+                                                })
                 order_obj.write(cr,uid, [active_id,new_order], {'state': 'done'})
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
                 picking_obj.force_assign(cr, uid, [new_picking], context)
@@ -254,7 +269,9 @@ class add_product(osv.osv_memory):
                 qty=data['quantity']
                 prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
                 val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
-                cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+                cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
+                            "WHERE w.lot_stock_id=s.id AND w.id=%s ",
+                            (order_id.shop_id.warehouse_id.id,))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
                 stock_dest_id = val.id
@@ -316,7 +333,9 @@ class add_product(osv.osv_memory):
         for order_id in order_obj.browse(cr, uid, active_ids, context=context):
             prop_ids =property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
             val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
-            cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+            cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
+                        " WHERE w.lot_stock_id=s.id AND w.id=%s ",
+                        (order_id.shop_id.warehouse_id.id,))
             res=cr.fetchone()
             location_id=res and res[0] or None
             stock_dest_id = val.id
@@ -331,13 +350,13 @@ class add_product(osv.osv_memory):
                             'date':date_cur
                         })
             for line in order_id.lines:
-                key=('return%s') %line.id
+                key= 'return%s' % line.id
                 if line.id: 
                     if data.has_key(key):
-                        qty = data['return%s' %line.id]
+                        qty = data[key]
                         lines_obj.write(cr,uid,[line.id], {
-                                'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
-                                'qty':line.qty-(data['return%s' %line.id] or 0.0)
+                                'qty_rfd':(line.qty or 0.0) + data[key],
+                                'qty':line.qty-(data[key] or 0.0)
                         })
                     else:
                         qty = line.qty
@@ -349,7 +368,7 @@ class add_product(osv.osv_memory):
                         'location_id':location_id,
                         'product_id':line.product_id.id,
                         'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
+                        'name':'%s (return)' % order_id.name,
                         'date':date_cur,
                         'date_planned':date_cur
                     })
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index f33af42c533..72cb18499e2 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -4,7 +4,7 @@
 
     <menuitem
         id="menu_process"
-        name="Enterprise Processes"
+        name="Enterprise Process"
         parent="base.menu_custom"
         groups="base.group_extended"/>
 
@@ -121,7 +121,7 @@
         </record>
 
     <record model="ir.actions.act_window" id="action_process_form">
-        <field name="name">Process</field>
+        <field name="name">Processes</field>
         <field name="res_model">process.process</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 613de646fe0..1148718668b 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -112,13 +112,14 @@ class product_pricelist(report_sxw.rml_parse):
         return res
 
     def _get_price(self,pricelist_id, product_id,qty):
+        sale_price_digits = self.get_digits(dp='Sale Price')
         pool = pooler.get_pool(self.cr.dbname)
         price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id,qty)
         if price_dict[pricelist_id]:
-            price = self.formatLang(price_dict[pricelist_id])
+            price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits)
         else:
             res = pool.get('product.product').read(self.cr, self.uid, [product_id])
-            price =  self.formatLang(res[0]['list_price'])
+            price =  self.formatLang(res[0]['list_price'], digits=sale_price_digits)
         return price
 
 report_sxw.report_sxw('report.product.pricelist','product.product','addons/product/report/product_pricelist.rml',parser=product_pricelist)
diff --git a/addons/project/project.py b/addons/project/project.py
index a1f02124c9d..996e79a1f8b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -174,10 +174,10 @@ class project(osv.osv):
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects."),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
-        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects."),
-        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
+        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", store=True),
+        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.", store=True),
+        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.", store=True),
+        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.", store=True),
         'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -441,6 +441,7 @@ class task(osv.osv):
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
         'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
+        'id': fields.integer('ID'),
     }
 
     _defaults = {
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 501c4787dee..6efc64dd494 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -302,7 +302,8 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&gt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                    <field name="id"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index e411248db4b..f4d8b32e569 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -72,7 +72,7 @@ class report_project_task_user(osv.osv):
                     date_trunc('day',t.date_end) as date_end,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
 --                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
-                    (extract('epoch' from (t.date_end-t.date_start)))/(3600*24)  as no_of_days,
+                    abs((extract('epoch' from (t.date_end-t.date_start)))/(3600*24))  as no_of_days,
                     t.user_id,
                     progress as progress,
                     t.project_id,
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 1ae5adc489a..9521d321000 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -155,7 +155,7 @@
         <field name="model">project.vs.hours</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Project and remaining hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+            <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
                 <field name="project"/>
                 <field name="remaining_hours"/>
                 <field name="state"/>
@@ -177,7 +177,7 @@
     </record>
 
     <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
-        <field name="name">Project and remaining hours</field>
+        <field name="name">Remaining Hours Per Project</field>
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -187,8 +187,8 @@
 
 	<record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
    </record>
    <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
@@ -262,7 +262,7 @@
     </record>
 
     <record id="action_project_vs_planned_total_hours_graph" model="ir.actions.act_window">
-        <field name="name">My projects: Planned Vs Total hours</field>
+        <field name="name">Projects: Planned Vs Total hours</field>
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -272,8 +272,8 @@
 
 	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
     </record>
     <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 17df3444b27..2788b59ed7d 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -141,7 +141,7 @@ class project_issue(crm.crm_case, osv.osv):
                 else:
                     res[issue.id][field] = abs(float(duration))
         return res
-
+    
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=128, required=True),
@@ -185,7 +185,7 @@ class project_issue(crm.crm_case, 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),
-        'assigned_to': fields.many2one('res.users', 'Assigned to', help='This is the current user to whom the related task have been assigned'),
+        'assigned_to': fields.related('task_id', 'user_id', string = 'Assigned to', type="many2one", relation="res.users", store=True, help='This is the current user to whom the related task have been assigned'),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 method=True, multi='working_days_open', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
@@ -193,6 +193,7 @@ class project_issue(crm.crm_case, osv.osv):
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
+        'progress': fields.related('task_id', 'progress', string='Progress (%)',group_operator="avg", store=True),
     }
 
     def _get_project(self, cr, uid, context):
@@ -245,6 +246,7 @@ class project_issue(crm.crm_case, osv.osv):
 
             vals = {
                 'task_id': new_task_id,
+                'state':'open'
             }
             case_obj.write(cr, uid, [bug.id], vals)
 
@@ -286,6 +288,15 @@ class project_issue(crm.crm_case, osv.osv):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{}}
+    
+    def onchange_task_id(self, cr, uid, ids, task_id, context=None):
+        if context is None:
+            context = {}
+        result = {}    
+        if not task_id:
+            return {'value':{}}
+        task = self.pool.get('project.task').browse(cr, uid, task_id, context)
+        return {'value':{'assigned_to': task.user_id.id,}}
 
     def case_escalate(self, cr, uid, ids, *args):
         """Escalates case to top level
@@ -307,6 +318,7 @@ class project_issue(crm.crm_case, osv.osv):
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
+        self._history(cr, uid, cases, _('Escalate'))
         return True
 
     def message_new(self, cr, uid, msg, context):
@@ -358,6 +370,31 @@ class project_issue(crm.crm_case, osv.osv):
 
         return res
 
+    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 = {}
+        stage_obj = self.pool.get('crm.case.stage')
+        domain = [('object_id.model', '=', self._name)]
+        if 'force_domain' in context and context['force_domain']:
+            domain += context['force_domain']
+        sid = stage_obj.search(cr, uid, domain, context=context)
+        s = {}
+        previous = {}
+        section = self._name
+
+        for stage in stage_obj.browse(cr, uid, sid, context=context):
+            s.setdefault(section, {})
+            s[section][previous.get(section, False)] = stage.id
+            previous[section] = stage.id
+        return s
+
+
     def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
         if context is None:
             context = {}
@@ -405,6 +442,17 @@ class project_issue(crm.crm_case, osv.osv):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not context:
+            context={}
+        issue = self.read(cr, uid, id, ['name'], context=context)
+        if not default:
+            default = {}
+        default = default.copy()
+        default['name'] = issue['name'] + _(' (copy)')
+        return super(project_issue, self).copy(cr, uid, id, default=default,
+                context=context)
 
 project_issue()
 
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ef4ecdd3957..a66dfe90560 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -68,7 +68,7 @@
                     <field name="user_id"/>
                     <field name="assigned_to" />
                         <group colspan="2" col="4">
-                        <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection"/>
+                        <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection" readonly="1"/>
                         <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
@@ -85,9 +85,10 @@
                             <separator colspan="3" string="Status"/>
                             <field name="version_id" colspan="3" widget="selection"/>
                             <field name="priority" colspan="3"/>
-                            <field name="task_id" />
+                            <field name="task_id" on_change="onchange_task_id(task_id)"/>
                             <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
                                 attrs="{'invisible':[('task_id','!=',False)]}" />
+                            <field name="progress" colspan="3" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                             </group>
                             <separator string= "Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4"/>
@@ -201,6 +202,7 @@
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
                     <field name="assigned_to"/>
+                    <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
                     <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" help="To Do"/>
@@ -224,9 +226,9 @@
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
+                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
                         <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')), ('create_date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
                             />
                         <separator orientation="vertical"/>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 9003bd608a7..5d5a0489fa9 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -135,7 +135,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
-                            context="{'group_by':'company_id'}" />
+                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}" help="Current Day"/>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a535015d067..2caf36766b0 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from tools.translate import _
 from osv import fields, osv
 from resource.faces import task as Task
@@ -90,13 +91,26 @@ class project_phase(osv.osv):
        model_data_obj = self.pool.get('ir.model.data')
        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
+    
+    def _compute(self, cr, uid, ids, context=None):
+        res = {}
+        if not ids:
+            return res
+        for phase in self.browse(cr, uid, ids, context=context):
+            tot = 0.0
+            for task in phase.task_ids:
+                tot += task.planned_hours
+            res[phase.id] = {
+                'total_hours' : tot
+            }
+        return res
 
     _columns = {
         'name': fields.char("Name", size=64, required=True),
         'date_start': fields.date('Start Date', help="Starting Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'date_end': fields.date('End Date', help="Ending Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'constraint_date_start': fields.date('Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'constraint_date_end': fields.date('End Date', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'constraint_date_start': fields.date('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'constraint_date_end': fields.date('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'project_id': fields.many2one('project.project', 'Project', required=True),
         'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases', states={'cancelled':[('readonly',True)]}),
         'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases', states={'cancelled':[('readonly',True)]}),
@@ -108,7 +122,8 @@ class project_phase(osv.osv):
         'responsible_id': fields.many2one('res.users', 'Responsible', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
-                                  \n If the phase is over, the states is set to \'Done\'.')
+                                  \n If the phase is over, the states is set to \'Done\'.'),
+        'total_hours': fields.function(_compute, method=True, string='Total Hours'),
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
@@ -130,6 +145,14 @@ class project_phase(osv.osv):
             project_id = project_obj.browse(cr, uid, project, context=context)
             result['date_start'] = project_id.date_start
         return {'value': result}
+    
+    def onchange_days(self, cr, uid, ids, project, context=None):
+        result = {}
+        for id in ids:
+            project_id = self.browse(cr, uid, id, context=context)
+            newdate = datetime.strptime(project_id.date_start, '%Y-%m-%d') + relativedelta(days=project_id.duration or 0.0)
+            result['date_end'] = newdate.strftime('%Y-%m-%d')
+        return {'value': result}
 
     def _check_date_start(self, cr, uid, phase, date_end, context=None):
        if context is None:
@@ -277,7 +300,6 @@ class project_phase(osv.osv):
             context = {}
         resource_pool = self.pool.get('resource.resource')
         uom_pool = self.pool.get('product.uom')
-        phase_resource = False
         if context is None:
            context = {}
         default_uom_id = self._get_default_uom_id(cr, uid)
@@ -290,11 +312,11 @@ class project_phase(osv.osv):
             duration = str(avg_hours) + 'H'
             # Create a new project for each phase
             def Project():
+                # If project has working calendar then that
+                # else the default one would be considered
                 start = start_date
                 minimum_time_unit = 1
                 resource = phase_resource_obj
-                # If project has working calendar then that
-                # else the default one would be considered
                 if calendar_id:
                     working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
                     vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))
@@ -372,8 +394,10 @@ class project_resource_allocation(osv.osv):
     _columns = {
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
-        'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'),
-        'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'),
+        'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True),
+        'user_id': fields.related('resource_id', 'user_id', type='many2one', relation="res.users", string='User'),
+        'date_start': fields.date('Start Date', help="Starting Date"),
+        'date_end': fields.date('End Date', help="Ending Date"),
         'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a3ff3b39669..3412ba7ca08 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,14 +13,27 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="phase_id" date_start="phase_id_date_start" date_stop="phase_id_date_end" string="R.A." mode="year">
-               <level object="project.resource" link="resource_id" domain="[]">
-                   <field name="useability"/>
+              <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
+               <level object="res.users" link="user_id" domain="[]">
+                   <field name="useability" string="Availability"/>
                 </level>
               </gantt>
             </field>
         </record>
 
+        <record id="view_project_resource_allocation_calendar" model="ir.ui.view">
+            <field name="name">project.resource.allocation.calendar</field>
+            <field name="model">project.resource.allocation</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
+                    <field name="phase_id"/>
+                    <field name="project_id"/>
+                </calendar>
+            </field>
+        </record>
+
 
         <record id="view_project_resource_allocation_form" model="ir.ui.view">
             <field name="name">project.resource.allocation.form</field>
@@ -28,9 +41,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Resource Allocation">
-                    <field name="resource_id" select="1"/>
-                    <field name="phase_id"/>
-                    <field name="useability" string="Availability"/>
+                    <group colspan="4" col="6">
+                        <field name="resource_id"/>
+                        <field name="phase_id"/>
+                        <field name="project_id"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="useability" string="Availability"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -44,6 +62,7 @@
                 <tree editable="bottom" string="Project Resource Allocation">
                     <field name="resource_id"/>
                     <field name="phase_id"/>
+                    <field name="project_id"/>
                     <field name="useability"/>
                 </tree>
             </field>
@@ -58,11 +77,13 @@
                     <group colspan="4" col="20">
                         <field name="resource_id"/>
                         <field name="phase_id"/>
+                        <field name="project_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -73,7 +94,7 @@
             <field name="name">Resource Allocations</field>
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,gantt</field>
+            <field name="view_mode">gantt,tree,form,calendar</field>
              <field name="context">{}</field>
             <field name="search_view_id" ref="view_project_resource_allocation_search"/>
         </record>
@@ -97,7 +118,7 @@
 	                    <group colspan="2" col="4">
 	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
                            <newline/>
-	                       <field name="duration" colspan="1"/>
+	                       <field name="duration" colspan="1" on_change="onchange_days(project_id)" />
                            <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
 	                    </group>
 	                    <group colspan="2" col="2">
@@ -110,10 +131,14 @@
                             <field colspan="4" name="resource_ids" nolabel="1">
                                  <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
+                                    <field name="date_start"/>
+                                    <field name="date_end"/>
                                     <field name="useability"/>
                                   </tree>
                                   <form string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
+                                    <field name="date_start"/>
+                                    <field name="date_end"/>
                                     <field name="useability"/>
                                   </form>
                              </field>
@@ -134,6 +159,7 @@
                                     <field name="user_id"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
+                                    <field name="total_hours" sum='Total Hours'/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -151,6 +177,7 @@
                                             <group colspan="2" col="2">
                                                   <separator string="Planning" colspan="2"/>
                                                   <field name="planned_hours" widget="float_time"/>
+                                                <field name="total_hours" widget="float_time"/>
                                                 <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
                                                 <field name="effective_hours" invisible="1"/>
                                             </group>
@@ -263,7 +290,7 @@
             <field name="name">Project Phases</field>
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,gantt,calendar</field>
+            <field name="view_mode">gantt,tree,form,calendar</field>
             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
@@ -299,7 +326,30 @@
     # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
-
+    
+        <record id="view_phase_task_form2" model="ir.ui.view">
+            <field name="name">phase.task.form2</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                    <field name="phase_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_phase_task_search_form" model="ir.ui.view">
+            <field name="name">phase.task.search.form</field>
+            <field name="model">project.task</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="project.view_task_search_form"/>
+            <field name="arch" type="xml">
+                <field name="project_id" position="after">
+                    <field name="phase_id" select="1"/>
+                </field>
+            </field>
+        </record>   
+    
     <act_window
         id="project_phase_task_list"
         name="Related Tasks"
diff --git a/addons/project_messages/project_messages.py b/addons/project_messages/project_messages.py
index 88142f78984..93f83d62f4a 100644
--- a/addons/project_messages/project_messages.py
+++ b/addons/project_messages/project_messages.py
@@ -30,6 +30,7 @@ class messages(osv.osv):
     logger = netsvc.Logger()
 
     _columns = {
+        'create_date': fields.datetime('Creation Date', readonly=True),
         'from_id': fields.many2one('res.users', 'From', required=True, ondelete="CASCADE"),
         'to_id': fields.many2one('res.users', 'To', ondelete="CASCADE", help="Keep this empty to broadcast the message."),
         'project_id': fields.many2one('project.project', 'Project',
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 456a0269c99..e8a013cf2ae 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -55,6 +55,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Messages">
+                        <field name="create_date"/>
                         <field name="project_id"/>
                         <field name="from_id"/>
                         <field name="to_id"/>
@@ -67,8 +68,10 @@
            <field name="model">project.messages</field>
            <field name="type">search</field>
            <field name="arch" type="xml">
-               <search string="Communication Messages">
+               <search string="Project Messages">
                		<group>
+                        <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                        <separator orientation="vertical"/>
                			<field name="project_id"/>
                         <field name="from_id"/>
                         <field name="to_id"/>
@@ -86,7 +89,7 @@
         </record>
 
        	<record id="messages_form" model="ir.actions.act_window">
-            <field name="name">Communication Messages</field>
+            <field name="name">Project Messages</field>
             <field name="res_model">project.messages</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_project_messages_search"/>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 93a5c2c81b7..9363413e4a2 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -278,7 +278,6 @@
                 <search string="Planning statistics">
                     <group col="10" colspan="4">
                         <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
-                        <filter icon="gtk-execute" string="My Project" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="Planning Statistics of My Projects"/>
                         <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
@@ -294,6 +293,7 @@
             <field name="res_model">report_account_analytic.planning.stat</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
         </record>
         <menuitem id="next_id_85" name="Planning"
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index e7a5a2ee48f..f472369211b 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -18,13 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from mx import DateTime
 from osv import fields, osv
 from tools.translate import _
 import re
 import time
 import tools
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 
 class project_scrum_project(osv.osv):
     _inherit = 'project.project'
@@ -147,7 +147,7 @@ class project_scrum_sprint(osv.osv):
             proj = self.pool.get('project.project').browse(cr, uid, [project_id])[0]
             v['product_owner_id']= proj.product_owner_id and proj.product_owner_id.id or False
             v['scrum_master_id']= proj.user_id and proj.user_id.id or False
-            v['date_stop'] = (DateTime.now() + DateTime.RelativeDateTime(days=int(proj.sprint_size or 14))).strftime('%Y-%m-%d')
+            v['date_stop'] = (datetime.now() + relativedelta(days=int(proj.sprint_size or 14))).strftime('%Y-%m-%d')
         return {'value':v}
 
 project_scrum_sprint()
@@ -257,14 +257,14 @@ class project_scrum_product_backlog(osv.osv):
         'name' : fields.char('Feature', size=64, required=True),
         'note' : fields.text('Note'),
         'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to hide the product backlog without removing it."),
-        'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
+        'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]),
         'user_id': fields.many2one('res.users', 'Author'),
         'sprint_id': fields.many2one('project.scrum.sprint', 'Sprint'),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
         'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', method=True, string='Progress', help="Computed as: Time Spent / Total Time."),
-        'effective_hours': fields.function(_compute, multi="effective_hours", method=True, string='Spent Hours', help="Computed using the sum of the time spent on every related tasks"),
+        'effective_hours': fields.function(_compute, multi="effective_hours", method=True, string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
         'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
         'create_date': fields.datetime("Creation Date", readonly=True),
         'task_hours': fields.function(_compute, multi="task_hours", method=True, string='Task Hours', help='Estimated time of the total hours of the tasks')
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index fcf7cae08f5..843b35646e4 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -41,7 +41,7 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="expected_hours" sum="Planned hours" widget="float_time" string="Total Planned Hours"/>
-                    <field name="effective_hours" sum="Effective hours" widget="float_time" string="Total Spent Hours"/>
+                    <field name="effective_hours" sum="Spent hours" widget="float_time" string="Total Spent Hours"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
@@ -192,7 +192,19 @@
         <!--
               Scrum Sprint
        -->
-
+        
+        <record id="view_scrum_sprint_calendar" model="ir.ui.view">
+            <field name="name">project.scrum.sprint.calendar</field>
+            <field name="model">project.scrum.sprint</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar string="Scrum Sprint" date_start="date_start">
+                    <field name="name"/>
+                    <field name="project_id"/>
+                </calendar>
+            </field>
+        </record>
+        
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
             <field name="name">project.scrum.sprint.tree</field>
             <field name="model">project.scrum.sprint</field>
@@ -333,7 +345,7 @@
             <field name="name">Sprints</field>
             <field name="res_model">project.scrum.sprint</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
             <field name="context">{"search_default_filter_current": 1, "search_default_scrum_master_id":uid}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
@@ -345,7 +357,19 @@
         <!--
               Daily Meeting
        -->
-
+        
+        <record id="view_scrum_meeting_calendar" model="ir.ui.view">
+            <field name="name">project.scrum.meeting.calendar</field>
+            <field name="model">project.scrum.meeting</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar string="Scrum Meeting" date_start="date" color="user_id">
+                    <field name="sprint_id"/>
+                    <field name="project_id"/>
+                </calendar>
+            </field>
+        </record>
+        
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">project.scrum.meeting.tree</field>
             <field name="model">project.scrum.meeting</field>
@@ -424,7 +448,7 @@
             <field name="name">Scrum Meetings</field>
             <field name="res_model">project.scrum.meeting</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'search_default_scrum_daily':1,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index 2b8a641622d..1e0e9df66d5 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -31,6 +31,7 @@ class backlog_create_task(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         task = self.pool.get('project.task')
         backlog_id = self.pool.get('project.scrum.product.backlog')
+        document_pool = self.pool.get('ir.attachment')
         ids_task = []
 
         if context is None:
@@ -39,9 +40,9 @@ class backlog_create_task(osv.osv_memory):
         backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
         result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-
+        
         for backlog in backlogs:
-            ids_task.append(task.create(cr, uid, {
+            task_id = task.create(cr, uid, {
                 'product_backlog_id': backlog.id,
                 'name': backlog.name,
                 'description': backlog.note,
@@ -50,8 +51,11 @@ class backlog_create_task(osv.osv_memory):
                 'planned_hours': backlog.expected_hours,
                 'remaining_hours':backlog.expected_hours,
                 'sequence':backlog.sequence,
-            }))
-
+            })
+            document_ids = document_pool.search(cr, uid, [('res_id', '=', backlog.id), ('res_model', '=', backlog_id._name)])
+            for document_id in document_ids:
+                document_pool.copy(cr, uid, document_id, default={'res_id':task_id, 'res_model':task._name})
+            ids_task.append(task_id)
         return {
             'domain': "[('product_backlog_id','in',["+','.join(map(str, context['active_ids']))+"])]",
             'name': 'Tasks',
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 2b6d1f3bbed..5fbc2cbdcc2 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -333,7 +333,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -364,4 +364,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 3daeab14881..de25b07ff9d 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,7 +102,7 @@
         <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree colors="grey:state in ('done');red:date_end&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;" string="Purchase Requisition">
+            <tree colors="grey:state in ('done');red:date_end&lt;current_date and state not in ('done','cancel');black:date_end&gt;=current_date;" string="Purchase Requisition">
                 <field name="name"/>
                 <field name="user_id"/>
                 <field name="date_start"/>
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 5ef0479bf3d..ff262000409 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-02 08:58+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -40,7 +40,7 @@ msgstr "Đặt giao hàng"
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "Đối tác phân phối"
 
 #. module: sale
 #: constraint:ir.actions.act_window:0
@@ -58,11 +58,13 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"Nếu bạn không có đủ hàng để giao hàng toàn bộ một lần, bạn có chấp nhận giao "
+"hàng từng phần hay không?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "theo nhu cầu dự báo"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
@@ -100,13 +102,13 @@ msgstr "Sửa lại"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Hóa đơn ngoại lệ"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
+msgstr "Đây là danh sách các sản phẩm đã chọn được tạo ra cho hóa đơn này"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
@@ -126,7 +128,7 @@ msgstr "Xác nhận"
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Lập hóa đơn"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -139,6 +141,8 @@ msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
 msgstr ""
+"Bất kỳ khi nào nút xác nhận được chọn, trạng thái dự thảo sẽ được chuyển "
+"sang thủ công. Nghĩa là, báo giá được chuyển thành đơn chào hàng."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -194,7 +198,7 @@ msgstr "Đã hủy bỏ"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Vận chuyển ngoại lệ"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -229,7 +233,7 @@ msgstr "Tất cả một lúc"
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr ""
+msgstr "Việc thu mua hàng được tạo sau khi có xác nhận của đơn chào hàng."
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -271,7 +275,7 @@ msgstr "Thông tin các dơn đặt hàng"
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Số lượng (Đơn vị bán)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -281,6 +285,11 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Đơn chào hàng sẽ tự động tạo hóa đơn gợi ý (hóa đơn dự thảo). Số lượng yêu "
+"cầu và số lượng giao hàng có thể không giống nhau. Bạn phải chọn nếu bạn lập "
+"hóa đơn dựa trên số lượng đặt hàng hay số lượng giao hàng. Nếu sản phẩm là "
+"một dịch vụ, số lượng giao hàng có nghĩa là số giờ đã dùng để thực hiện các "
+"công việc liên quan."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -355,7 +364,7 @@ msgstr "Dòng hoá đơn"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "Phân phối lực lượng"
 
 #. module: sale
 #: view:sale.order:0
@@ -368,6 +377,9 @@ msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
 msgstr ""
+"Bảng kê bao bì hàng hóa được tạo khi nút 'Chỉ định' được chọn sau khi xác "
+"nhận đơn chào hàng. Giao dịch này chuyển đơn chào hàng sang bảng kê bao bì "
+"hàng hóa."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
@@ -386,6 +398,8 @@ msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
 msgstr ""
+"Khi bạn chọn chính sách vận chuyển = 'Tự động xuất hóa đơn sau khi giao "
+"hàng', nó sẽ tự động tạo sau khi giao hàng."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -475,7 +489,7 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,payment_account_id:0
 msgid "Payment Accounts"
-msgstr ""
+msgstr "Tài khoản thanh toán"
 
 #. module: sale
 #: constraint:product.template:0
@@ -506,7 +520,7 @@ msgstr "Tài khoản thanh toán"
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,end:0
 msgid "Close"
-msgstr ""
+msgstr "Đóng"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -534,18 +548,18 @@ msgstr "Giảm giá (%)"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr ""
+msgstr "Hóa đơn khách hàng dự thảo, sẽ được kế toán xem xét lại."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr ""
+msgstr "Đơn chào hàng sẽ được lập hóa đơn"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Procurement for each line"
-msgstr ""
+msgstr "Thu mua hàng cho mỗi sản phẩm"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree10
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index d796edd2d2c..b914e2b2d4b 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -86,17 +86,17 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <separator orientation="vertical"/>
                     <field name="shop_id" widget="selection"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 03252691fe7..fef8f21000f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -37,7 +37,10 @@ class sale_shop(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=False),
+    }
+    _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c),
     }
 
 sale_shop()
@@ -865,13 +868,6 @@ class sale_order_line(osv.osv):
         'product_packaging': False
     }
 
-    def create_sale_order_line_invoice(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        context.update({'active_ids' : ids,'active_id' : ids})
-        self.pool.get('sale.order.line.make.invoice').make_invoices(cr, uid, ids, context=context)
-        return True
-
     def invoice_line_create(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index eec5847ed92..be0d254debd 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -157,10 +157,10 @@
                                                 <field name="invoiced"/>
                                                 <group attrs="{'invisible':[('invoiced','=',True)]}">
                                                 <button colspan="1"
-                                                    name="create_sale_order_line_invoice"
+                                                    name="%(action_view_sale_order_line_make_invoice)d"
                                                     states="confirmed"
-                                                    string="Create Invoice"
-                                                    type="object"
+                                                    string="Make Invoices"
+                                                    type="action"
                                                     icon="terp-document-new" />
                                                  </group>
                                             </group>
@@ -364,6 +364,7 @@ to your configuration: from the sales order, from the pickings, etc.
                     <field name="salesman_id"/>
                     <field name="price_subtotal"/>
                     <field name="state"/>
+                    <field name="invoiced"/>
                 </tree>
             </field>
         </record>
@@ -373,7 +374,6 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order Lines">
-                    <separator colspan="4" string="General Information"/>
 				    <group colspan="4" col="6">
 						<field name="order_id"/>
 						<field name="product_id" readonly="1"/>
@@ -381,50 +381,36 @@ to your configuration: from the sales order, from the pickings, etc.
 						<field name="product_uom_qty" readonly="1"/>
 						<field groups="product.group_uos" name="product_uos_qty"/>
 						<field name="product_uom"/>
+						<field colspan="4" name="name" groups="base.group_extended"/>
 						<field name="company_id" groups="base.group_multi_company" readonly="1"/>
 						<field name="order_partner_id" readonly="1" invisible="1"/>
 				    </group>
-                    <notebook>
-                        <page string="Order Lines">
-                            <separator colspan="4" string="Manual Designation"/>
-                            <group colspan="4" col="6">
-                            <field name="type" groups="base.group_extended"/>
-                            <field name="delay" groups="base.group_extended"/>
-                            <field name="th_weight" groups="base.group_extended"/>
-                            <field name="price_unit"/>
-                            <field name="discount"/>
-                            <field name="price_subtotal"/>
-                            </group>
-                            <separator colspan="4" string="Description"/>
-                            <field colspan="4" name="name" groups="base.group_extended"/>
-                            <separator colspan="4" string="Taxes"/>
-                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
-                            <separator colspan="4"/>
-                            <field name="state"/>
-                            <group col="3" colspan="2">
-                                <button colspan="1"
-                                  name="create_sale_order_line_invoice"
-                                  string="Create Invoice"
-                                  type="object"
-                                  icon="terp-document-new"
-                                  attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>
-                                <button name="button_cancel"
-                                    string="Cancel" type="object"
-                                    icon="gtk-cancel"
-                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
-                                <button name="button_done"
-                                    string="Done" type="object"
-                                    icon="gtk-jump-to"
-                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
-                            </group>
-                        </page>
-                        <page string="Invoice Lines" groups="base.group_extended">
-                            <field colspan="4" name="invoice_lines" nolabel="1"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <separator colspan="4" string="Price"/>
+                    <group colspan="4" col="6">
+	                    <field name="price_unit"/>
+	                    <field name="discount"/>
+	                    <field name="price_subtotal"/>
+                    </group>
+                    <separator colspan="4" string="Notes"/>
+                    <field colspan="4" name="notes" nolabel="1"/>
+                    <separator colspan="4"/>
+                    <field name="state"/>
+                    <group col="3" colspan="2">
+                       <!-- <button colspan="1"
+                          name="%(action_view_sale_order_line_make_invoice)d"
+                          string="Make Invoice"
+                          type="action"
+                          icon="terp-document-new"
+                          attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>-->
+                        <button name="button_cancel"
+                            string="Cancel" type="object"
+                            icon="gtk-cancel"
+                            attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
+                        <button name="button_done"
+                            string="Done" type="object"
+                            icon="gtk-jump-to"
+                            attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
index 0aa18df1c9f..d5e81c9e96c 100644
--- a/addons/sale/test/so_make_line_invoice.yml
+++ b/addons/sale/test/so_make_line_invoice.yml
@@ -41,15 +41,20 @@
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
 -
-  I click on the "Create Invoice" button of sale order line
+  I click on the "Make Invoice" button of sale order line
+-
+  !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_0}:
+    {}
+-
+  I click on the "Create Invoice" button of wizard
 - 
-  !python {model: sale.order.line}: |
+  !python {model: sale.order.line.make.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
     sol = so.order_line[0] 
-    self.create_sale_order_line_invoice(cr, uid, [sol.id], {"lang": "en_US",
-      "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
-      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
+    self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_0")], {"lang": "en_US",
+      "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id],
+      "search_default_uninvoiced": 1, "active_id": sol.id,
       })
 -
   I verify that "Invoiced" has been set to True.
@@ -115,17 +120,20 @@
     sale_id=self.browse(cr, uid, ref("sale_order_so3"))
     assert(sale_id.invoiced == True), "Paid has not been set to true"
 -
-  I click on the "Create Invoice" button of sale order and verify that it gives a warning message
+  I create an invoice for another sale order line. I click on the "Make Invoice" button of sale order line
 -
-  I create an invoice for another sale order line. I click on the "Create Invoice" button of sale order line
-- 
-  !python {model: sale.order.line}: |
+  !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_1}:
+    {} 
+-
+  I click on the "Create Invoice" button of wizard
+-
+  !python {model: sale.order.line.make.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
     sol = so.order_line[1]    
-    self.create_sale_order_line_invoice(cr, uid, [sol.id], {"lang": "en_US",
-      "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")],
-      "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"),
+    self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_1")], {"lang": "en_US",
+      "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id],
+      "search_default_uninvoiced": 1, "active_id": sol.id,
       })
 -
   I verify that invoice for sale order line has been created.
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 63a26587d43..b48247f8e58 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -20,7 +20,18 @@
             <field name="res_model">sale.order.line.make.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="view_sale_order_line_make_invoice"/>
             <field name="target">new</field>
         </record>
+        
+        <record model="ir.values" id="sale_order_line_make_invoice">
+            <field name="model_id" ref="sale.model_sale_order_line" />
+            <field name="object" eval="1" />
+            <field name="name">Make Invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_order_line_make_invoice'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order.line</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 2bef6b67513..106e6945207 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -24,8 +24,18 @@
             <field name="res_model">sale.make.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="view_sale_order_make_invoice"/>
             <field name="target">new</field>
         </record>
-
+        
+        <record model="ir.values" id="sale_order_make_invoice">
+            <field name="model_id" ref="sale.model_sale_order" />
+            <field name="object" eval="1" />
+            <field name="name">Make Invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_sale_order_make_invoice'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index f4305329d0d..8a8eb0d2c1e 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,8 +1,9 @@
 <openerp>
    <data>
-
+        <menuitem id="base.menu_base_config" name="Configuration" parent="base.menu_base_partner" sequence="30"
+            groups="base.group_system,base.group_sale_salesman"/>
         <menuitem id="menu_sale_journal_config" name="Sale Journals"
-            parent="base.menu_base_config" sequence="5" groups="base.group_system"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_system,base.group_sale_salesman"/>
 
    <!--  sale journal invoice Type's Form  view -->
 
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index ce82796235f..beca56b838e 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -56,9 +56,9 @@ class sale_order_dates(osv.osv):
             return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date'),
-        'requested_date': fields.date('Requested Date'),
-        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date'),
+        'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"),
+        'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales"),
+        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date',help="Date on which picking is created"),
     }
 
 sale_order_dates()
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 317180c7209..c2b46959e1d 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -181,7 +181,7 @@
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index 364ee89e09c..03be7d6afc7 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:09+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-02 08:09+0000\n"
+"Last-Translator: irbiserg@mail.ru <irbiserg@mail.ru>\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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -29,7 +29,7 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Stock Location Paths"
-msgstr ""
+msgstr "Расположение патча"
 
 #. module: stock_location
 #: constraint:ir.model:0
@@ -80,7 +80,7 @@ msgstr "Ручное управление"
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "stock.location.path"
-msgstr ""
+msgstr "расположение патча"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index e72034e11d2..c95bd33ac32 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -189,9 +189,9 @@ class survey_analysis(report_rml):
 
                         for ans in que.answer_choice_ids:
                             rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
-                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d" % ans.id)
+                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %s", (ans.id,))
                             tot_res = cr.fetchone()[0]
-                            cr.execute("select count(id) ,sra.column_id from survey_response_answer sra where sra.answer_id = %d group by sra.column_id" % ans.id)
+                            cr.execute("select count(id) ,sra.column_id from survey_response_answer sra where sra.answer_id=%s group by sra.column_id", (ans.id,))
                             calc_res = cr.dictfetchall()
                             for mat_col in range(1, len(matrix_ans)):
                                 percantage = 0.0
@@ -210,7 +210,7 @@ class survey_analysis(report_rml):
                         rml += """</blockTable>"""
 
                         if que.is_comment_require:
-                            cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
+                            cr.execute("select count(id) from survey_response_line where question_id = %s and comment != ''",(que.id,))
                             tot_res = cr.fetchone()[0]
                             rml += """<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
@@ -244,7 +244,7 @@ class survey_analysis(report_rml):
 
                         if que.is_comment_require:
 #                            if que.make_comment_field:
-#                                cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
+#                                cr.execute("select count(id) from survey_response_line where question_id = %s and comment != ''", (que.id,))
 #                                tot_res = cr.fetchone()[0]
 #                                tot_avg = 0.00
 #                                if que.tot_resp:
@@ -253,13 +253,13 @@ class survey_analysis(report_rml):
 #                                        <td><para style="answer">""" + str(tot_avg) + """%</para></td>
 #                                        <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 #                            else:
-                            cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
+                            cr.execute("select count(id) from survey_response_line where question_id = %s and comment != ''", (que.id,))
                             tot_res = cr.fetchone()[0]
                             rml += """<blockTable colWidths="450.0,50.0" style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 
                     elif que.type in['single_textbox']:
-                        cr.execute("select count(id) from survey_response_line where question_id = %d and single_text!=''" % que.id)
+                        cr.execute("select count(id) from survey_response_line where question_id = %s and single_text!=''",(que.id,))
                         rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
@@ -270,7 +270,7 @@ class survey_analysis(report_rml):
                             </blockTable>"""
 
                     elif que.type in['comment']:
-                        cr.execute("select count(id) from survey_response_line where question_id = %d and comment !=''" % que.id)
+                        cr.execute("select count(id) from survey_response_line where question_id = %s and comment !=''", (que.id,))
                         rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
@@ -303,12 +303,12 @@ class survey_analysis(report_rml):
                             rating_weight_sum = 0
                             for mat_col in range(1, len(matrix_ans)):
                                 cr.execute("select count(sra.answer_id) from survey_response_line sr, survey_response_answer sra\
-                                     where sr.id = sra.response_id and  sra.answer_id = %d and sra.column_id ='%d'" % (ans.id,matrix_ans[mat_col][0]))
+                                     where sr.id = sra.response_id and  sra.answer_id = %s and sra.column_id ='%s'", (ans.id,matrix_ans[mat_col][0]))
                                 tot_res = cr.fetchone()[0]
                                 cr.execute("select count(sra.answer_id),sqc.rating_weight from survey_response_line sr, survey_response_answer sra ,\
                                         survey_question_column_heading sqc where sr.id = sra.response_id and \
-                                        sqc.question_id = sr.question_id  and sra.answer_id = %d and sqc.title ='%s'\
-                                        group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col][1]))
+                                        sqc.question_id = sr.question_id  and sra.answer_id = %s and sqc.title ='%s'\
++                                       group by sra.answer_id,sqc.rating_weight", (ans.id,matrix_ans[mat_col][1]))
                                 col_weight =  cr.fetchone()
 
                                 if not col_weight:
@@ -352,10 +352,10 @@ class survey_analysis(report_rml):
                                 rml += """<td><para style="response">""" + to_xml(tools.ustr(menu)) + """</para></td>"""
                             rml += """<td><para style="response-bold">Answer Count</para></td></tr>"""
                             cr.execute("select count(id), sra.answer_id from survey_response_answer sra \
-                                     where sra.column_id='%s' group by sra.answer_id "  % (column.id))
+                                     where sra.column_id='%s' group by sra.answer_id ", (column.id,))
                             res_count = cr.dictfetchall()
                             cr.execute("select count(sra.id),sra.value_choice, sra.answer_id, sra.column_id from survey_response_answer sra \
-                                 where sra.column_id='%s'  group by sra.value_choice ,sra.answer_id, sra.column_id" % (column.id))
+                                 where sra.column_id='%s' group by sra.value_choice ,sra.answer_id, sra.column_id", (column.id,))
                             calc_percantage = cr.dictfetchall()
 
                             for ans in que.answer_choice_ids:
@@ -393,7 +393,7 @@ class survey_analysis(report_rml):
                              <td> <para style="response-bold">Answer Count</para></td>
                          </tr>"""
                         for ans in que.answer_choice_ids:
-                            cr.execute("select answer from survey_response_answer where answer_id=%d group by answer" % ans.id)
+                            cr.execute("select answer from survey_response_answer where answer_id=%s group by answer", (ans.id,))
                             tot_res = cr.dictfetchall()
                             total = 0
                             for  tot in tot_res:
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 4b44b6a1753..109f4509d81 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -108,7 +108,7 @@ class survey_question_wiz(osv.osv_memory):
                             if sur_rec.state != "open" :
                                 raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
-                                                    and survey_id=%s' % (uid,survey_id))
+                                                    and survey_id=%s', (uid,survey_id))
                             res = cr.fetchone()[0]
                             user_limit = survey_obj.browse(cr, uid, survey_id)
                             user_limit = user_limit.response_user
@@ -401,12 +401,12 @@ class survey_question_wiz(osv.osv_memory):
 
                         address_id = user_obj.browse(cr, uid, uid).address_id.id
                         if address_id:
-                            cr.execute("select email from res_partner_address where id =%d" % address_id)
+                            cr.execute("select email from res_partner_address where id =%s", (address_id,))
                             user_email = cr.fetchone()[0]
                         resp_id = survey_data.responsible_id.address_id
 
                         if resp_id:
-                            cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
+                            cr.execute("select email from res_partner_address where id =%s", (resp_id.id,))
                             resp_email = cr.fetchone()[0]
                         if user_email and resp_email:
                             user_name = user_obj.browse(cr, uid, uid).name
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index d0c830bfa8b..1c028a9e019 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -159,9 +159,6 @@ class thunderbird_partner(osv.osv_memory):
         msg_ids = []
         res = {}
         res_ids = []
-        if message_id:
-            msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)])
-        if msg_ids and len(msg_ids): return 0
         for ref_id in ref_ids:
             msg_new = dictcreate.get('message')
             ref = ref_id.split(',')
@@ -181,6 +178,24 @@ class thunderbird_partner(osv.osv_memory):
         message = dictcreate.get('message')
         return self.pool.get('email.server.tools').process_email(cr, uid, model, message, attach=True, context=None)
 
+    def search_message(self, cr, uid, message, context=None):
+        #@param message: string of mail which is read from EML File
+        #@return model,res_id
+        dictcreate = dict(message)
+        message = dictcreate.get('message')
+        msg_pool = self.pool.get('mailgate.message')
+        msg = self.pool.get('email.server.tools').parse_message(message)
+        message_id = msg.get('message-id', False)
+        model = False
+        res_id = False
+        if message_id:
+            msg_ids = msg_pool.search(cr, uid, [('message_id','=',message_id)])
+            if msg_ids and len(msg_ids):
+                msg = msg_pool.browse(cr, uid, msg_ids[0])
+                model = msg.model
+                res_id = msg.res_id
+        return (model,res_id)
+
     def search_contact(self, cr, user, email):
         address_pool = self.pool.get('res.partner.address')
         address_ids = address_pool.search(cr, user, [('email','=',email)])
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index e928318e313..56dd5241b9a 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 2ee7837623f..b81a298f20a 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
index cacd522718e..9d39e4c5cfc 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
@@ -25,7 +25,6 @@
         <label  align="right" id="name"  value="&name.value;" width="80" />
 		<textbox id="txtselectpartner" align="right" width="270" readonly="true"/>
         <spacer width="5"/>
-         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);" width="133"/>
 	</hbox>
     <separator class="groove-thin" orient="horizontal" width="94"/> 
    </groupbox>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
index 96f4a43b578..637d412d51b 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -175,6 +175,8 @@ function searchmail()
 		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
 	}
 }
+
+
 var openPartnerHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -190,16 +192,17 @@ var openPartnerHandler = {
                 alert("Partner is not Available.");
                 return;
             } 
-            if(strlSearchResult=="partner_id"){
-                partner_id = strlSearchResultValue;
-                weburl = getWebServerURL();
-                var branchobj = getPref();
-                db_name = branchobj.getCharPref("serverdbname");
-                if (weburl == false){
-                    weburl = 'http://localhost:8080'
-                }
-                if (partner_id > 0){
-                    window.open(weburl + "/model=res.partner&id=" + partner_id)
+            if(strlSearchResult=="partner_id"){
+                partner_id = strlSearchResultValue;
+                weburl = getWebServerURL();
+                webport = getwebPort();
+                var urlport = weburl+':'+webport
+
+                if (parseInt(partner_id) > 0){
+                  var t = urlport + "/openerp/form/view?model=res.partner&id="+partner_id;
+                  alert(t + ":" + " " + "\n\n" + "If you can not open this link directly in web browser then you can copy the link and paste in web browser.");
+                  window.open(t);
+                
                 }
                 else{
                     alert("Partner is not Available.");
@@ -292,19 +295,21 @@ function open_partner()
 	}
     searchPartner(senderemail);
 }
+
 var listDocumentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
-        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
-		model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString);
-        weburl = getWebServerURL()
-        if (weburl == false){
-            weburl = 'http://localhost:8080'
-        }
-        var branchobj = getPref();
-        db_name = branchobj.getCharPref("serverdbname");
-        window.open(weburl + "/model=" + model +"&id=" + res_id)
+	onResult: function(client, context, result) {
+		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+		var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
+		model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); 
+        weburl = getWebServerURL();
+        webport = getwebPort();
+        
+        var urlport = weburl+':'+webport;
+        var t = urlport + "/openerp/form/view?model=" + model +"&id=" + res_id;
+        alert(t + ":" + " " + "\n\n" + "If you can not open this link directly in web browser then you can copy the link and paste in web browser.");
+        window.open(t); 
+         
 	},
 	onFault: function (client, ctxt, fault) {
 
@@ -313,12 +318,14 @@ var listDocumentHandler = {
 	onError: function (client, ctxt, status, errorMsg) {
 
 	}
-}
+} 
+
+
 function open_document()
-{
+{
     if (check() == false){
         return true
-    }
+    }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
 	var version_obj = prefService.getBranch("extensions.");
 	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
@@ -355,12 +362,14 @@ function open_document()
 	strmethod.data = 'search_message';
 	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 	strobj.data = 'thunderbird.partner';
-    var eml_string = parse_eml()
-	var a = ['model', 'message'];
-	var b = [object, eml_string];
-	var arrofarr = dictcontact(a,b);
+    var eml_string = parse_eml()
+	var a = ['message'];
+	var b = [eml_string];
+	var arrofarr = dictcontact(a,b); 
 	xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-}
+}
+
+
 function open_contact()
 {	
 	if (check() == false){
@@ -428,6 +437,64 @@ function open_contact()
     searchContact();
 }
 
+function search_document()
+{	
+	if (check() == false){
+        return true
+    }
+    
+    var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+	var version_obj = prefService.getBranch("extensions.");
+	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+	version = version_obj.getCharPref("lastAppVersion");
+	version = parseInt(version[0])
+	
+	file = getPredefinedFolder(2);
+	
+	if (version > 2)
+	{
+		var emlsArray = gFolderDisplay.selectedMessages;
+	}
+	else
+	{
+		var emlsArray = GetSelectedMessages();
+	}
+
+	IETtotal = emlsArray.length;
+	IETexported = 0;
+	var msguri = emlsArray[0];
+
+	
+	//gives the selected email uri
+	var messageUri= gDBView.URIForFirstSelectedMessage;
+
+	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+
+	//gives the selected email object 
+	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+
+	//functionality to split the author name and email
+	if(message.author.charAt(0) == '"'){
+		sendername = message.author.split('"')[1].split('"')[0];
+	}
+	else if(message.author.indexOf('<')!=-1){
+		sendername = message.author.split('<')[0];
+	}
+	else{
+		sendername = message.author;
+	}
+	if(message.author.indexOf('<')!=-1){
+		senderemail = message.author.split('<')[1].split('>')[0];
+	}
+	else{
+		senderemail = message.author
+	}
+
+	//set the initial information for the selected email
+    setSenderEmail(senderemail);
+    setSenderName(sendername);
+    searchdocument();
+}
 
 //function to open the configuration window
 var Config = {
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
index 6e2af251052..230ab391ff1 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
@@ -42,18 +42,11 @@
 		oncommand="searchmail();" />
 </toolbarpalette> 
 
-<toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button1"
-		class="toolbarbutton-1"
-		image="&partnericon.value;"
-		label= "Open Contact"
-		oncommand="Address.onMenuItemCommand(event);" />
-</toolbarpalette> 
 <toolbarpalette id="MailToolbarPalette">
 	<toolbarbutton id="GA-button2"
 		class="toolbarbutton-1"
 		image="&partnericon.value;"
-		label= "Open Partner"
+		label= "Open Partner"
         oncommand="open_partner();"
 		  />
 </toolbarpalette>
@@ -62,7 +55,7 @@
 		class="toolbarbutton-1"
 		image="&imagearchive.value;"
 		label= "Open Document"
-		oncommand="open_document();"  />
+		oncommand="search_document();"  />
 </toolbarpalette> 
 
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index 0736e39b3ed..34b68ee9bc3 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -408,6 +408,11 @@ function getWebServerURL(){
 	return getPref().getCharPref('webserverurl');
 }
 
+//get webserver port
+function getwebPort(){
+	return getPref().getCharPref('webserverport');
+}
+
 //get username from config settings
 function getUsername(){
 	return getPref().getCharPref('username');
@@ -961,6 +966,41 @@ function module_install()
     xmlRpcClient.asyncCall(listinstallmodulehandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod, strvalue],6);
 }
 
+var listSearchwebdocumentHandler = {
+	onResult: function(client, context, result) {
+		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var sendername = getSenderEmail();
+		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+		var count = arrIdList.Count();
+		for (i = 0; i < count; i++) {
+			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+           }
+           if(strlSearchResult=="email" && strlSearchResultValue!=''){
+                 setSenderEmail(strlSearchResultValue);
+                 var t = getSenderEmail();
+                  open_document();} 
+    
+            if(strlSearchResult=="email" && strlSearchResultValue==''){
+                alert("Contact is not available.so not open any document.");
+            } 
+
+            if(strlSearchResult=="res_id"){
+                 setResourceId(strlSearchResultValue);
+                 var t = getResourceId();}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+
+}
+
+
 
 var listSearchContactHandler = {
 	onResult: function(client, context, result) {
@@ -1031,6 +1071,7 @@ var listSearchContactHandler = {
 	}
 
 }
+
 var listSearchContactdetailHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -1271,6 +1312,31 @@ function searchCheckbox()
 	xmlRpcClient.asyncCall(listSearchCheckboxHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,arrofarr ],6);
 }
 
+function searchdocument()
+{
+	var branchobj = getPref();
+	setServerService('xmlrpc/object');
+	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+	arrFinalList = [];
+	var xmlRpcClient = getXmlRpc();
+	var cmbSearchList = document.getElementById('listSearchBox');
+	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strDbName.data = branchobj.getCharPref("serverdbname");
+	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+	struid.data = branchobj.getIntPref('userid');
+	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strpass.data = branchobj.getCharPref("password");
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strobj.data = 'thunderbird.partner';
+	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strmethod.data = 'search_contact';
+	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strname.data = getSenderEmail();
+  	
+	xmlRpcClient.asyncCall(listSearchwebdocumentHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+}
+
+
 function searchContact()
 {
 	var branchobj = getPref();
@@ -1484,9 +1550,7 @@ function upload_archivemail()
     var arrofarr = dictcontact(a,b);
 
     xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-   // alert("Mail Archived Successfully to" +" " + ":" + " "+ list_documents.value);
-	//window.close();
-    
+     
 }
 
 var listArchiveDocumentHandler = {
@@ -1762,12 +1826,7 @@ var listLoginHandler = {
 			setUserId(login.data);
             module_install();
             alert('Successfully Login To OpenERP.');
-            if (check_module_install(5) == false){
-                alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
-            }
-			else{
-                window.close();
-            }
+            window.close();
 		}
 		else{
 			alert("Login Failed");
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index 48bec840d1a..fb257d70c95 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -3,7 +3,7 @@
 <!ENTITY tinyarchive "Push to OpenERP">
 <!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
 <!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp-icon.png">
-<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner.png">
+<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner_icon.png">
 <!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
 <!ENTITY tooltip.value "Add To Archive">
 <!ENTITY pluginconfig.value "OpenERP Configuration Settings">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png
new file mode 100644
index 00000000000..b8f4a0f380b
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
index ca8332c868e..1383eb28ea7 100755
--- a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -1,6 +1,9 @@
-
+pref("network.protocol-handler.app.http","/usr/bin/firefox");
+pref("network.protocol-handler.app.https","/usr/bin/firefox");
 pref("extensions.tiny.serverurl", "http://localhost");
 pref("extensions.tiny.serverport", "8069");
+pref("extensions.tiny.webserverurl", "http://localhost");
+pref("extensions.tiny.webserverport", "8080");
 pref("extensions.tiny.serverdbname", "terp");
 pref("extensions.tiny.username","admin");
 pref("extensions.tiny.password","admin");