diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 3bc6e4d6322..c35382b028f 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1021,6 +1021,7 @@
         <record id="EUR" model="res.currency">
             <field name="name">EUR</field>
             <field name="code">EUR</field>
+            <field name="symbol">€</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <!-- Company ID will be set later -->
@@ -1031,7 +1032,7 @@
             <field name="currency_id" ref="EUR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <!-- Basic Company  -->
         <record id="main_company" model="res.company">
             <field name="name">OpenERP S.A.</field>
@@ -1041,7 +1042,7 @@
             <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
-        
+
         <assert id="main_company" model="res.company">
             <test expr="currency_id.code == 'eur'.upper()"/>
             <test expr="name">OpenERP S.A.</test>
@@ -1066,6 +1067,7 @@
             <field name="company_id" ref="main_company"/>
         </record>
 
+        <!-- The Following currency rates are considered as on 1st Jan,2010 against EUR. -->
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
             <field name="company_id" ref="main_company"/>
@@ -1073,260 +1075,298 @@
         <record id="USD" model="res.currency">
             <field name="name">USD</field>
             <field name="code">USD</field>
+            <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUSD" model="res.currency.rate">
-            <field name="rate">1.3785</field>
+            <field name="rate">1.2834</field>
             <field name="currency_id" ref="USD"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="VEB" model="res.currency">
             <field name="name">Bs</field>
             <field name="code">VEB</field>
+            <field name="symbol">Bs</field>
             <field name="rounding">2.95</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateVEB" model="res.currency.rate">
-            <field name="rate">3132.9</field>
+            <field name="rate">2768.45</field>
             <field name="currency_id" ref="VEB"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="CAD" model="res.currency">
             <field name="name">CAD</field>
             <field name="code">CAD</field>
+            <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCAD" model="res.currency.rate">
-            <field name="rate">1.451</field>
+            <field name="rate">1.3388</field>
             <field name="currency_id" ref="CAD"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="CHF" model="res.currency">
             <field name="name">CHF</field>
             <field name="code">CHF</field>
+            <field name="symbol">CHF</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCHF" model="res.currency.rate">
-            <field name="rate">1.644</field>
+            <field name="rate">1.3086</field>
             <field name="currency_id" ref="CHF"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="BRL" model="res.currency">
             <field name="name">BRL</field>
             <field name="code">BRL</field>
+            <field name="symbol">R$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateBRL" model="res.currency.rate">
-            <field name="rate">2.588</field>
+            <field name="rate">2.2344</field>
             <field name="currency_id" ref="BRL"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="CNY" model="res.currency">
             <field name="name">CNY</field>
             <field name="code">CNY</field>
+            <field name="symbol">¥</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateCNY" model="res.currency.rate">
-            <field name="rate">10.4311</field>
+            <field name="rate">8.7556</field>
             <field name="currency_id" ref="CNY"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="COP" model="res.currency">
             <field name="name">COP</field>
             <field name="code">COP</field>
+            <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
+        <record id="rateCOP" model="res.currency.rate">
+            <field name="rate">2933.8378</field>
+            <field name="currency_id" ref="COP"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
         
         <record id="CZK" model="res.currency">
             <field name="name">Kč</field>
             <field name="code">CZK</field>
+            <field name="symbol">Kč</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+        <record id="rateCZK" model="res.currency.rate">
+            <field name="rate">26.5634</field>
+            <field name="currency_id" ref="CZK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
         <record id="DKK" model="res.currency">
             <field name="name">kr</field>
             <field name="code">DKK</field>
+            <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateDKK" model="res.currency.rate">
-            <field name="rate">7.4416</field>
+            <field name="rate">7.4445</field>
             <field name="currency_id" ref="DKK"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="HUF" model="res.currency">
             <field name="name">Ft</field>
             <field name="code">HUF</field>
+            <field name="symbol">Ft</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
+        <record id="rateHUF" model="res.currency.rate">
+            <field name="rate">271.5621</field>
+            <field name="currency_id" ref="HUF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
         
         <record id="IDR" model="res.currency">
             <field name="name">Rs</field>
             <field name="code">IDR</field>
+            <field name="symbol">Rs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+        <record id="rateIDR" model="res.currency.rate">
+            <field name="rate">13495.2056</field>
+            <field name="currency_id" ref="IDR"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+
         <record id="LVL" model="res.currency">
             <field name="name">Ls</field>
             <field name="code">LVL</field>
+            <field name="symbol">Ls</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateLVL" model="res.currency.rate">
-            <field name="rate">0.71</field>
+            <field name="rate">0.7086</field>
             <field name="currency_id" ref="LVL"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="NOK" model="res.currency">
             <field name="name">kr</field>
             <field name="code">NOK</field>
+            <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateNOK" model="res.currency.rate">
-            <field name="rate">7.93</field>
+            <field name="rate">7.8668</field>
             <field name="currency_id" ref="NOK"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="PAB" model="res.currency">
             <field name="name">PAB</field>
             <field name="code">PAB</field>
+            <field name="symbol">B/.</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="ratePAB" model="res.currency.rate">
-            <field name="rate">1.3813</field>
+            <field name="rate">1.2676</field>
             <field name="currency_id" ref="PAB"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
         <record id="PLN" model="res.currency">
             <field name="name">zł</field>
             <field name="code">PLN</field>
+            <field name="symbol">zł</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
+        <record id="ratePLN" model="res.currency.rate">
+            <field name="rate">4.1005</field>
+            <field name="currency_id" ref="PLN"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
         
         <record id="SEK" model="res.currency">
             <field name="name">kr</field>
             <field name="code">SEK</field>
+            <field name="symbol">kr</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
+        <record id="rateSEK" model="res.currency.rate">
+            <field name="rate">10.3004</field>
+            <field name="currency_id" ref="SEK"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
         
         <record id="GBP" model="res.currency">
             <field name="name">GBP</field>
             <field name="code">GBP</field>
+            <field name="symbol">₤</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateGBP" model="res.currency.rate">
-            <field name="rate">0.675</field>
+            <field name="rate">0.8333</field>
             <field name="currency_id" ref="GBP"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="ARS" model="res.currency">
             <field name="name">ARS</field>
             <field name="code">ARS</field>
+            <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
-        </record>
-        
-		<record id="rateARS" model="res.currency.rate">
-			<field name="rate">5.6</field>
+        </record>        
+=		<record id="rateARS" model="res.currency.rate">
+			<field name="rate">5.0881</field>
 			<field name="currency_id" ref="ARS"/>
 			<field eval="time.strftime('%Y-01-01')" name="name"/>
-		</record>        
- 
+		</record>
+
         <record id="INR" model="res.currency">
             <field name="name">INR</field>
             <field name="code">Rs</field>
+            <field name="symbol">Rs</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateINR" model="res.currency.rate">
-            <field name="rate">0.634</field>
+            <field name="rate">59.9739</field>
             <field name="currency_id" ref="INR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
 
-        <record id="rateINR2001" model="res.currency.rate">
-            <field name="rate">0.631</field>
-            <field name="currency_id" ref="INR"/>
-            <field name="name">2001-01-01</field>
-        </record>
-        <record id="rateINR2002" model="res.currency.rate">
-            <field name="rate">0.632</field>
-            <field name="currency_id" ref="INR"/>
-            <field name="name">2002-01-01</field>
-        </record>
-
         <record id="AUD" model="res.currency">
             <field name="name">AUD</field>
             <field name="code">AUD</field>
+            <field name="symbol">$</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateAUD" model="res.currency.rate">
-            <field name="rate">1.5266</field>
+            <field name="rate">1.4070</field>
             <field name="currency_id" ref="AUD"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="UAH" model="res.currency">
             <field name="name">UAH</field>
             <field name="code">UAH</field>
+            <field name="symbol">₴</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
         <record id="rateUAH" model="res.currency.rate">
-            <field name="rate">10.8266</field>
+            <field name="rate">10.1969</field>
             <field name="currency_id" ref="UAH"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index cc8e4e4e618..3e066be541c 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-17 05:31+0000\n"
+"PO-Revision-Date: 2010-09-08 22:19+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 0eceac86108..1f735f7a9c8 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-02 05:54+0000\n"
+"PO-Revision-Date: 2010-09-08 21:58+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 9a56c042752..9a84b9d32e4 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -6,13 +6,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2009-12-16 06:38+0000\n"
+"PO-Revision-Date: 2010-09-08 21:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index b3bb99bddba..f5c483a1ea6 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-07-10 04:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-08 22:13+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index b06da6d2d9b..c8fd6543421 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-02 05:52+0000\n"
+"PO-Revision-Date: 2010-09-08 21:29+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 26c4f1630e8..9aa1d6711fe 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-11 04:49+0000\n"
+"PO-Revision-Date: 2010-09-08 21:58+0000\n"
 "Last-Translator: Sadegh Ismael Nattaj <nat@sethack.com>\n"
 "Language-Team: OpenERP Iran <info@openerp-iran.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 3c360967a9b..d047c631b97 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 07:50+0000\n"
+"PO-Revision-Date: 2010-09-03 07:19+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\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-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-04 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 4dbb8a39452..3860fd934b8 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:44+0000\n"
+"PO-Revision-Date: 2010-09-08 22:15+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index a194927953f..d8037764f13 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-08 21:23+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-09-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 71e5a32dbc5..05022b07899 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:33+0000\n"
+"PO-Revision-Date: 2010-09-08 21:43+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 6748220b4a6..219e3dee773 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.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-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 10:24+0000\n"
+"PO-Revision-Date: 2010-09-08 21:12+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@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-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 26c8890c0d0..6f6984acf72 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-19 05:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-08 22:14+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 2b9ab084af9..457ad820f87 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-06-01 04:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-08 21:50+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 7304553f7a2..1fafe9a9676 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-08 05:18+0000\n"
+"PO-Revision-Date: 2010-09-08 22:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index eabd96a5066..a2ec11a4e26 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-08 21:39+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: <pt@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-03 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -24,7 +24,7 @@ msgstr "Santa Helena"
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "SMS - Gateway: clickatell"
 
 #. module: base
 #: view:res.lang:0
@@ -725,12 +725,12 @@ msgstr "STOCK_OK"
 #: selection:ir.actions.server,state:0
 #: selection:workflow.activity,kind:0
 msgid "Dummy"
-msgstr ""
+msgstr "Imitação"
 
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML inválido para Arquitetura da View"
 
 #. module: base
 #: model:res.country,name:base.ky
@@ -923,7 +923,7 @@ msgstr "STOCK_REMOVE"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "raw"
-msgstr ""
+msgstr "não processado"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -1019,6 +1019,8 @@ msgid ""
 "You try to install the module '%s' that depends on the module:'%s'.\n"
 "But this module is not available in your system."
 msgstr ""
+"Você está tentando instalar o módulo '%s' que depende do módulo: '%s'.\n"
+"Mas este módulo não está disponivel em seu sistema."
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1467,6 +1469,8 @@ msgstr "Madadascar"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"O nome do Objeto deve começar com x_ e não deve conter nenhum caracter "
+"especial!"
 
 #. module: base
 #: help:ir.rule.group,global:0
@@ -1486,7 +1490,7 @@ msgstr "Menu"
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr ""
+msgstr "Taxa atual"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1555,7 +1559,7 @@ msgstr "Zimbábue"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
 msgid "Import / Export"
-msgstr ""
+msgstr "Importar / Exportar"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -1763,7 +1767,7 @@ msgstr "%S - Segundos como um numero decimal[00,61]."
 #. module: base
 #: model:res.country,name:base.am
 msgid "Armenia"
-msgstr ""
+msgstr "Armênia"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1778,7 +1782,7 @@ msgstr "Diariamente"
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
-msgstr ""
+msgstr "Suécia"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -1811,7 +1815,7 @@ msgstr "Configuração da ação de iteração"
 #. module: base
 #: model:res.country,name:base.at
 msgid "Austria"
-msgstr ""
+msgstr "Austria"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -1932,7 +1936,7 @@ msgstr "Prefixo"
 #. module: base
 #: field:ir.actions.server,loop_action:0
 msgid "Loop Action"
-msgstr ""
+msgstr "Ação de repetição"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1962,7 +1966,7 @@ msgstr "Iniciar atualização"
 #. module: base
 #: field:ir.default,ref_id:0
 msgid "ID Ref."
-msgstr ""
+msgstr "Ref. de ID"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -2061,7 +2065,7 @@ msgstr "Voce tambem pode importar arquivos .po ."
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "Unable to find a valid contract"
-msgstr ""
+msgstr "Não foi possível encontrar um contrato válido."
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
@@ -2193,7 +2197,7 @@ msgstr "Países"
 #. module: base
 #: view:ir.rule.group:0
 msgid "Record rules"
-msgstr ""
+msgstr "Registro de Regras"
 
 #. module: base
 #: field:res.partner,vat:0
@@ -2303,7 +2307,7 @@ msgstr "Categorias"
 #: model:ir.actions.wizard,name:base.res_partner_send_sms_wizard
 #: wizard_button:res.partner.sms_send,init,send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "Enviar SMS"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -2486,6 +2490,8 @@ msgid ""
 "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Informe o assunto. Voce pode usar campos de um objeto. Ex.: `Olá [[ "
+"object.partner_id.name ]]`"
 
 #. module: base
 #: view:res.company:0
@@ -2545,7 +2551,7 @@ msgstr "Atualização de Sistema"
 #. module: base
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
-msgstr "Transações de Entrada"
+msgstr "Transições de Entrada"
 
 #. module: base
 #: model:res.country,name:base.sr
@@ -2577,6 +2583,8 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"Voce tenta atualizar um módulo que depende do módulo: %s. \n"
+"Mas este módulo não está disponível em seu sistema."
 
 #. module: base
 #: view:res.partner.address:0
@@ -2762,7 +2770,7 @@ msgstr ""
 #. module: base
 #: view:res.users:0
 msgid "Skip"
-msgstr ""
+msgstr "Saltar"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request_link-act
@@ -2855,7 +2863,7 @@ msgstr "Cabeçalho RML"
 #. module: base
 #: wizard_field:res.partner.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3475,6 +3483,8 @@ msgid ""
 "Some installed modules depend on the module you plan to Uninstall :\n"
 " %s"
 msgstr ""
+"Alguns módulos instalados dependem do módulo que voce deseja desinstalar:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -3569,7 +3579,7 @@ msgstr "terp-mrp"
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
 msgid "Trigger On"
-msgstr ""
+msgstr "Ligar gatilho"
 
 #. module: base
 #: model:res.country,name:base.fj
@@ -3793,7 +3803,7 @@ msgstr "Itens de trabalho"
 #. module: base
 #: field:wizard.module.lang.export,advice:0
 msgid "Advice"
-msgstr ""
+msgstr "Advertência"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3967,7 +3977,7 @@ msgstr "Aplicar atualizações agendadas"
 #. module: base
 #: model:ir.ui.menu,name:base.maintenance
 msgid "Maintenance"
-msgstr ""
+msgstr "Manutenção"
 
 #. module: base
 #: model:res.country,name:base.mp
@@ -4107,7 +4117,7 @@ msgstr "Itens de trabalho do workflow"
 #. module: base
 #: model:res.country,name:base.vc
 msgid "Saint Vincent & Grenadines"
-msgstr ""
+msgstr "Saint Vincent & Grenadines"
 
 #. module: base
 #: field:ir.model.config,password:0
@@ -4226,7 +4236,7 @@ msgstr "Nome do modelo inválido na definição da ação."
 #. module: base
 #: wizard_field:res.partner.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Mensagem SMS"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4338,7 +4348,7 @@ msgstr "E-mail do Remetente"
 #. module: base
 #: field:ir.default,field_name:0
 msgid "Object Field"
-msgstr ""
+msgstr "Campo de objeto"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -4592,7 +4602,7 @@ msgstr "iCal id"
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "Enviar SMS em massa"
 
 #. module: base
 #: view:res.lang:0
@@ -4626,6 +4636,8 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
+"Não posso criar o arquivo de módulo:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_update
@@ -4784,7 +4796,7 @@ msgstr "Reunião"
 #. module: base
 #: field:ir.rule.group,global:0
 msgid "Global"
-msgstr ""
+msgstr "Global"
 
 #. module: base
 #: model:res.country,name:base.cz
@@ -4890,7 +4902,7 @@ msgstr "Tipo de visão"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_2
 msgid "User Interface"
-msgstr ""
+msgstr "Interface de Usuário"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5583,7 +5595,7 @@ msgstr "Versão instalada"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflow Definitions"
-msgstr ""
+msgstr "Definição de workflow"
 
 #. module: base
 #: model:res.country,name:base.mr
@@ -5927,6 +5939,9 @@ msgid ""
 "' \\n                    'for the currency: %s \n"
 "' \\n                    'at the date: %s"
 msgstr ""
+"Nenhuma valor encontrado \n"
+"'\\n 'para a taxa escolhida: %s \n"
+"'\\n 'na data: %s"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6491,7 +6506,7 @@ msgstr "Holanda"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_4
 msgid "Low Level Objects"
-msgstr ""
+msgstr "Objetos de baixo nível"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_report_custom
@@ -7163,7 +7178,7 @@ msgstr "Adicionar ou não um cabeçalho RML corporativo"
 #. module: base
 #: field:res.partner.event,document:0
 msgid "Document"
-msgstr ""
+msgstr "Documento"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7550,7 +7565,7 @@ msgstr "Correspondendo a"
 #. module: base
 #: field:ir.actions.configuration.wizard,name:0
 msgid "Next Wizard"
-msgstr ""
+msgstr "Próximo assistente"
 
 #. module: base
 #: field:ir.attachment,datas_fname:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index d9877949a9c..8da568869ef 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:31+0000\n"
+"PO-Revision-Date: 2010-09-08 21:06+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-03 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 091d88c771d..5cbed590523 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-07 05:12+0000\n"
+"PO-Revision-Date: 2010-09-08 21:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 43859e4c63f..10b208222e7 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-02 06:38+0000\n"
+"PO-Revision-Date: 2010-09-08 22:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-03 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 561430fc92b..655c43df5c5 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-01 06:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-08 21:31+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-09-02 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 905b2dc1778..33962c557c4 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -50,7 +50,7 @@ class ir_cron(osv.osv, netsvc.Agent):
         'interval_number': fields.integer('Interval Number'),
         'interval_type': fields.selection( [('minutes', 'Minutes'),
             ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
-        'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),        
+        'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
         'doall' : fields.boolean('Repeat Missed'),
         'nextcall' : fields.datetime('Next Call Date', required=True),
         'model': fields.char('Object', size=64),
@@ -77,7 +77,7 @@ class ir_cron(osv.osv, netsvc.Agent):
         except:
             return False
         return True
-    
+
     _constraints = [
         (_check_args, 'Invalid arguments', ['args']),
     ]
@@ -98,7 +98,7 @@ class ir_cron(osv.osv, netsvc.Agent):
         try:
             db, pool = pooler.get_db_and_pool(db_name)
         except:
-            return False        
+            return False
         cr = db.cursor()
         try:
             if not pool._init:
@@ -107,7 +107,7 @@ class ir_cron(osv.osv, netsvc.Agent):
                 for job in cr.dictfetchall():
                     nextcall = datetime.strptime(job['nextcall'], '%Y-%m-%d %H:%M:%S')
                     numbercall = job['numbercall']
-                
+
                     ok = False
                     while nextcall < now and numbercall:
                         if numbercall > 0:
@@ -125,12 +125,12 @@ class ir_cron(osv.osv, netsvc.Agent):
 
 
             cr.execute('select min(nextcall) as min_next_call from ir_cron where numbercall<>0 and active and nextcall>=now()')
-            next_call = cr.dictfetchone()['min_next_call']  
+            next_call = cr.dictfetchone()['min_next_call']
             if next_call:
                 next_call = time.mktime(time.strptime(next_call, '%Y-%m-%d %H:%M:%S'))
             else:
                 next_call = int(time.time()) + 3600   # if do not find active cron job from database, it will run again after 1 day
-        
+
             if not check:
                 self.setAlarm(self._poolJobs, next_call, db_name, db_name)
 
@@ -138,29 +138,31 @@ class ir_cron(osv.osv, netsvc.Agent):
             logger = netsvc.Logger()
             logger.notifyChannel('cron', netsvc.LOG_WARNING,
                 'Exception in cron:'+str(ex))
-        
+
         finally:
             cr.commit()
             cr.close()
 
-            
+    def restart(self, dbname):
+        self.cancel(dbname)
+        self._poolJobs(dbname)
+
     def create(self, cr, uid, vals, context=None):
-        res = super(ir_cron, self).create(cr, uid, vals, context=context)        
+        res = super(ir_cron, self).create(cr, uid, vals, context=context)
         cr.commit()
-        self.cancel(cr.dbname)
-        self._poolJobs(cr.dbname)
+        self.restart(cr.dbname)
         return res
+
     def write(self, cr, user, ids, vals, context=None):
         res = super(ir_cron, self).write(cr, user, ids, vals, context=context)
         cr.commit()
-        self.cancel(cr.dbname)
-        self._poolJobs(cr.dbname)
+        self.restart(cr.dbname)
         return res
+
     def unlink(self, cr, uid, ids, context=None):
         res = super(ir_cron, self).unlink(cr, uid, ids, context=context)
         cr.commit()
-        self.cancel(cr.dbname)
-        self._poolJobs(cr.dbname)
+        self.restart(cr.dbname)
         return res
 ir_cron()
 
diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index 29c7ca308b4..631e42eb39b 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -132,11 +132,25 @@ class ir_translation(osv.osv):
 
     @tools.cache(skiparg=3)
     def _get_source(self, cr, uid, name, tt, lang, source=None):
+        """
+        Returns the translation for the given combination of name, type, language
+        and source. All values passed to this method should be unicode (not byte strings),
+        especially ``source``.
+
+        :param name: identification of the term to translate, such as field name
+        :param type: type of term to translate (see ``type`` field on ir.translation)
+        :param lang: language code of the desired translation
+        :param source: optional source term to translate (should be unicode)
+        :rtype: unicode
+        :return: the request translation, or an empty unicode string if no translation was
+                 found and `source` was not passed
+        """
+        # FIXME: should assert that `source` is unicode and fix all callers to always pass unicode
+        # so we can remove the string encoding/decoding.
+
         if not lang:
-            return ''
+            return u''
         if source:
-            #if isinstance(source, unicode):
-            #   source = source.encode('utf8')
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
@@ -152,9 +166,9 @@ class ir_translation(osv.osv):
                         'and name=%s',
                     (lang or '', tt, tools.ustr(name)))
         res = cr.fetchone()
-        trad = res and res[0] or ''
+        trad = res and res[0] or u''
         if source and not trad:
-            return source
+            return tools.ustr(source)
         return trad
 
     def create(self, cursor, user, vals, context=None):
diff --git a/bin/addons/base/module/wizard/base_export_language.py b/bin/addons/base/module/wizard/base_export_language.py
index ca4f9a0d116..ca2e3059cfb 100644
--- a/bin/addons/base/module/wizard/base_export_language.py
+++ b/bin/addons/base/module/wizard/base_export_language.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -27,7 +27,7 @@ from osv import fields,osv
 from tools.translate import _
 from tools.misc import get_iso_codes
 
-class base_export_language(osv.osv_memory):
+class base_language_export(osv.osv_memory):
 
     def _get_languages(self, cr, uid, context):
         lang_obj=pooler.get_pool(cr.dbname).get('res.lang')
@@ -67,7 +67,7 @@ class base_export_language(osv.osv_memory):
         buf.close()
         return self.write(cr, uid, ids, {'state':'get', 'data':out, 'advice':this.advice, 'name':this.name}, context=context)
 
-    _name = "base.export.language"
+    _name = "base.language.export"
     _columns = {
             'name': fields.char('Filename', 16, readonly=True),
             'lang': fields.selection(_get_languages, 'Language', help='To export a new language, do not select a language.'), # not required: unset = new language
@@ -82,7 +82,7 @@ class base_export_language(osv.osv_memory):
     _defaults = { 'state': lambda *a: 'choose',
                   'name': lambda *a: 'lang.tar.gz'
                 }
-base_export_language()
+base_language_export()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/bin/addons/base/module/wizard/base_export_language_view.xml b/bin/addons/base/module/wizard/base_export_language_view.xml
index 090e364d316..389a97d0954 100644
--- a/bin/addons/base/module/wizard/base_export_language_view.xml
+++ b/bin/addons/base/module/wizard/base_export_language_view.xml
@@ -4,25 +4,33 @@
 
         <record id="wizard_lang_export" model="ir.ui.view">
             <field name="name">Export a Translation File</field>
-            <field name="model">base.export.language</field>
+            <field name="model">base.language.export</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form col="3" string="Export language">
+                <form string="Export language">
                     <notebook>
                         <page string="Export Data">
-                            <group col="2" colspan="4" fill="0" states="choose">
-                                <separator colspan="2" string="Export translation file"/>
+                            <group colspan="4" states="choose">
+                                <separator colspan="4" string="Export translation file"/>
                                 <field name="lang" required="1"/>
                                 <field name="format" required="1"/>
                                 <field height="200" name="modules" nolabel="1" colspan="4"/>
                                 <field invisible="1" name="state"/>
                             </group>
-                            <group col="1" fill="0" states="get">
-                                <separator string="Export done"/>
-                                <field name="name" invisible="1"/>
-                                <field name="data" nolabel="1" readonly="1" fieldname="name"/>
-                                <field height="80" name="advice" nolabel="1"/>
+                            <group colspan="4" states="get">
+                                <separator string="Export done" colspan="4"/>
+                                <field name="name" invisible="1" colspan="4"/>
+                                <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
+                                <field height="80" name="advice" nolabel="1" colspan="4"/>
                             </group>
+                            <separator string="" colspan="4"/>
+                                <group col="2" colspan="2">
+                                </group>
+                                <group col="2" colspan="2">
+                                    <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
+                                    <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
+                                    <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
+                                </group>    
                         </page>
                         <page string="Help">
                             <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
@@ -31,12 +39,6 @@
                             <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
                         </page>
                     </notebook>
-
-                    <group col="2" colspan="3" fill="0">
-                        <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="Close" type="object"/>
-                        <button icon="gtk-ok" name="act_getfile" states="choose" string="Get file" type="object"></button>
-                        <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="Close" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
@@ -44,7 +46,7 @@
         <record id="action_wizard_lang_export" model="ir.actions.act_window">
             <field name="name">Export a Translation File</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base.export.language</field>
+            <field name="res_model">base.language.export</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml
index 799ff4e9179..031969543f7 100644
--- a/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@ -10,27 +10,30 @@
             <form string="Import language">
             <notebook colspan="4">
                 <page string="Import Data">
-                    <group colspan="2" col="4">
-                    <separator string="Import New Language" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <separator string="Import New Language" colspan="4"/>
                         <field name="name" width="200"/>
                         <field name="code"/>
                         <field name="data" colspan="4"/>
                     </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="2" col="2">
+                    </group>
+                    <group colspan="2" col="2">
+                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                        <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
+                    </group>
                 </page>
                 <page string="Help">
-                    <label string="You have to import a .CSV file which is encoded in UTF-8.\n
-    Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
+                    <label string="You have to import a .CSV file which is encoded in UTF-8."/>
+                    <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
                     <label string="type,name,res_id,src,value" colspan="4"/>
                     <label string="module,type,name,res_id,src,value" colspan="4"/>
                     <label string="You can also import .po files." colspan="4" align="0.0"/>
                 </page>
-                </notebook>
-                <newline/>
-                <group colspan="6" >
-                <button special="cancel" string="Close" icon="gtk-cancel"/>
-                <button name="import_lang" string="OK" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
+            </notebook>
+            
+            </form>
             </field>
         </record>
 
@@ -50,4 +53,4 @@
         parent="menu_translation_export"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/report/custom_new.xsl b/bin/addons/base/report/custom_new.xsl
index 5a385f3e7eb..6680314ca40 100644
--- a/bin/addons/base/report/custom_new.xsl
+++ b/bin/addons/base/report/custom_new.xsl
@@ -14,8 +14,8 @@
 
 	<xsl:template name="stylesheet">
 		<paraStyle name="title" fontName="Helvetica-Bold" fontSize="22" alignment="center"/>
-		<paraStyle name="test" alignment="left" leftIndent="10.0"/>
-        <paraStyle name="float_right" alignment="right"/>
+		<paraStyle name="test" alignment="left" />
+        <paraStyle name="float_right" alignment="left"/>
         <paraStyle name="tbl_heading" alignment="left"/>
 		<blockTableStyle id="products">
 			<!--<blockBackground colorName="grey" start="0,0" stop="-1,0"/> -->
@@ -114,7 +114,7 @@
 							</para>
 						</xsl:when>
                        <xsl:when test="@tree='float'">
-                           <para style="float_right"><font fontName="Helvetica-bold" fontSize="9" color="blue">
+                           <para style="float_right"><font fontName="Helvetica-bold" fontSize="9" color="black">
                                <xsl:value-of select="."/>
                                </font></para>
                        </xsl:when>
@@ -131,7 +131,7 @@
 
 						<xsl:otherwise>
 							<para>
-								<font fontName="Helvetica-bold" fontSize="9" color="blue">
+								<font fontName="Helvetica-bold" fontSize="9" color="black">
 								<xsl:value-of select="."/>
 								</font>
 							</para>
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 11a3032dafc..f5772274dd9 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -305,7 +305,10 @@ class res_partner_address(osv.osv):
                 if r['name'] and (r['city'] or r['country_id']):
                     addr += ', '
                 addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' '  + (r['street'] or '')
-                res.append((r['id'], addr.strip() or '/'))
+                if context.get('contact_display', 'contact')=='partner_address':
+                    res.append((r['id'], r['partner_id'][1] +','+ addr.strip() or '/'))
+                else:
+                    res.append((r['id'], addr.strip() or '/'))
         return res
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@@ -313,7 +316,7 @@ class res_partner_address(osv.osv):
             args=[]
         if not context:
             context={}
-        if context.get('contact_display', 'contact')=='partner':
+        if context.get('contact_display', 'contact')=='partner ' or context.get('contact_display', 'contact')=='partner_address '  :
             ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context)
         else:
             if not name:
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index a529fcbb200..f94c4fbeaa6 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -330,7 +330,7 @@ class res_config_installer(osv.osv_memory):
 
     def _already_installed(self, cr, uid, context=None):
         """ For each module (boolean fields in a res.config.installer),
-        check if it's already installed (neither uninstallable nor uninstalled)
+        check if it's already installed (either 'to install', 'to upgrade' or 'installed')
         and if it is, check it by default
         """
         modules = self.pool.get('ir.module.module')
@@ -341,7 +341,7 @@ class res_config_installer(osv.osv_memory):
             cr, uid,
             modules.search(cr, uid,
                            [('name','in',selectable),
-                            ('state','not in',['uninstallable', 'uninstalled'])],
+                            ('state','in',['to install', 'installed', 'to upgrade'])],
                            context=context),
             context=context)
 
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 0d03c067223..1a233df4f19 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -27,26 +27,29 @@ from tools.misc import currency
 from tools.translate import _
 
 class res_currency(osv.osv):
-    def _current_rate(self, cr, uid, ids, name, arg, context={}):
-        res={}
+    def _current_rate(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        res = {}
         if 'date' in context:
-            date=context['date']
+            date = context['date']
         else:
-            date=time.strftime('%Y-%m-%d')
-        date= date or time.strftime('%Y-%m-%d')
+            date = time.strftime('%Y-%m-%d')
+        date = date or time.strftime('%Y-%m-%d')
         for id in ids:
             cr.execute("SELECT currency_id, rate FROM res_currency_rate WHERE currency_id = %s AND name <= %s ORDER BY name desc LIMIT 1" ,(id, date))
             if cr.rowcount:
-                id, rate=cr.fetchall()[0]
-                res[id]=rate
+                id, rate = cr.fetchall()[0]
+                res[id] = rate
             else:
-                res[id]=0
+                res[id] = 0
         return res
     _name = "res.currency"
     _description = "Currency"
     _columns = {
         'name': fields.char('Currency', size=32, required=True),
         'code': fields.char('Code', size=3),
+        'symbol': fields.char('Symbol', size=3),
         'rate': fields.function(_current_rate, method=True, string='Current Rate', digits=(12,6),
             help='The rate of the currency to the currency of rate 1'),
         'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),
@@ -70,9 +73,9 @@ class res_currency(osv.osv):
             if r.__contains__('rate_ids'):
                 rates=r['rate_ids']
                 if rates:
-                    currency_rate_obj=self.pool.get('res.currency.rate')
-                    currency_date=currency_rate_obj.read(cr,user,rates[0],['name'])['name']
-                    r['date']=currency_date
+                    currency_rate_obj=  self.pool.get('res.currency.rate')
+                    currency_date = currency_rate_obj.read(cr,user,rates[0],['name'])['name']
+                    r['date'] = currency_date
         return res
 
     def round(self, cr, uid, currency, amount):
@@ -86,7 +89,9 @@ class res_currency(osv.osv):
     def is_zero(self, cr, uid, currency, amount):
         return abs(self.round(cr, uid, currency, amount)) < currency.rounding
 
-    def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context={}, account=None, account_invert=False):
+    def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=None, account=None, account_invert=False):
+        if context is None:
+            context = {}
         if not from_currency_id:
             from_currency_id = to_currency_id
         if not to_currency_id:
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index a26d22346ce..60ddf0d98e8 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -26,13 +26,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Currency">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                    <group col="6" colspan="6">
+                        <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="company_id" select="2" />
                         <field name="rate"/>
+                        <field name="company_id" select="2" groups="base.group_multi_company" />
+                        <field name="symbol"/>
                     </group>
-                    
+
                     <group col="2" colspan="2">
                         <separator string="Price Accuracy" colspan="2"/>
                         <field name="rounding"/>
@@ -44,7 +45,7 @@
                         <field name="base"/>
                         <field name="active" select="1"/>
                     </group>
-                    
+
                     <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
                         <form string="Rates">
                             <field name="name"/>
diff --git a/bin/netsvc.py b/bin/netsvc.py
index 3c3a727cb71..52825c48f82 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -165,21 +165,24 @@ LEVEL_COLOR_MAPPING = {
     logging.CRITICAL: (WHITE, RED),
 }
 
-class ColoredFormatter(logging.Formatter):
+class DBFormatter(logging.Formatter):
+    def format(self, record):
+        record.dbname = getattr(threading.currentThread(), 'dbname', '?')
+        return logging.Formatter.format(self, record)
+
+class ColoredFormatter(DBFormatter):
     def format(self, record):
         fg_color, bg_color = LEVEL_COLOR_MAPPING[record.levelno]
         record.levelname = COLOR_PATTERN % (30 + fg_color, 40 + bg_color, record.levelname)
-        return logging.Formatter.format(self, record)
-
+        return DBFormatter.format(self, record)
 
 def init_logger():
     import os
     from tools.translate import resetlocale
     resetlocale()
 
-    logger = logging.getLogger()
     # create a format for log messages and dates
-    format = '[%(asctime)s] %(levelname)s:%(name)s:%(message)s'
+    format = '[%(asctime)s][%(dbname)s] %(levelname)s:%(name)s:%(message)s'
 
     if tools.config['syslog']:
         # SysLog Handler
@@ -188,7 +191,7 @@ def init_logger():
         else:
             handler = logging.handlers.SysLogHandler('/dev/log')
         format = '%s %s' % (release.description, release.version) \
-               + ':%(levelname)s:%(name)s:%(message)s'
+                + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
 
     elif tools.config['logfile']:
         # LogFile Handler
@@ -213,10 +216,11 @@ def init_logger():
     if isinstance(handler, logging.StreamHandler) and os.isatty(handler.stream.fileno()):
         formatter = ColoredFormatter(format)
     else:
-        formatter = logging.Formatter(format)
+        formatter = DBFormatter(format)
     handler.setFormatter(formatter)
 
     # add the handler to the root logger
+    logger = logging.getLogger()
     logger.addHandler(handler)
     logger.setLevel(int(tools.config['log_level'] or '0'))
 
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 8df4f9e1fc9..a495cd9063e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -44,7 +44,6 @@ import logging
 import operator
 import pickle
 import re
-import string
 import time
 import traceback
 import types
@@ -200,10 +199,10 @@ class browse_record(object):
             field_values = self._table.read(self._cr, self._uid, ids, field_names, context=self._context, load="_classic_write")
             if self._fields_process:
                 lang = self._context.get('lang', 'en_US') or 'en_US'
-                lang_obj_ids = self.pool.get('res.lang').search(self._cr, self._uid,[('code','=',lang)])
+                lang_obj_ids = self.pool.get('res.lang').search(self._cr, self._uid, [('code', '=', lang)])
                 if not lang_obj_ids:
                     raise Exception(_('Language with code "%s" is not defined in your system !\nDefine it through the Administration menu.') % (lang,))
-                lang_obj = self.pool.get('res.lang').browse(self._cr, self._uid,lang_obj_ids[0])
+                lang_obj = self.pool.get('res.lang').browse(self._cr, self._uid, lang_obj_ids[0])
 
                 for field_name, field_column in fields_to_fetch:
                     if field_column._type in self._fields_process:
@@ -215,7 +214,7 @@ class browse_record(object):
             if not field_values:
                 # Where did those ids come from? Perhaps old entries in ir_model_dat?
                 self.__logger.warn("No field_values found for ids %s in %s", ids, self)
-                raise KeyError('Field %s not found in %s'%(name,self))
+                raise KeyError('Field %s not found in %s'%(name, self))
             # create browse records for 'remote' objects
             for result_line in field_values:
                 new_data = {}
@@ -223,7 +222,7 @@ class browse_record(object):
                     if field_column._type in ('many2one', 'one2one'):
                         if result_line[field_name]:
                             obj = self._table.pool.get(field_column._obj)
-                            if isinstance(result_line[field_name], (list,tuple)):
+                            if isinstance(result_line[field_name], (list, tuple)):
                                 value = result_line[field_name][0]
                             else:
                                 value = result_line[field_name]
@@ -347,7 +346,7 @@ def get_pg_type(f):
             f_type = ('int4', 'INTEGER')
         else:
             f_type = ('varchar', 'VARCHAR(%d)' % f_size)
-    elif isinstance(f, fields.function) and eval('fields.'+(f._type),globals()) in type_dict:
+    elif isinstance(f, fields.function) and eval('fields.'+(f._type), globals()) in type_dict:
         t = eval('fields.'+(f._type), globals())
         f_type = (type_dict[t], type_dict[t])
     elif isinstance(f, fields.function) and f._type == 'float':
@@ -394,7 +393,7 @@ class orm_template(object):
                 context=context
         )
 
-    def view_init(self, cr , uid , fields_list, context=None):
+    def view_init(self, cr, uid, fields_list, context=None):
         """Override this method to do specific things when a view on the object is opened."""
         pass
 
@@ -410,8 +409,8 @@ class orm_template(object):
         else:
             model_id = cr.fetchone()[0]
         if 'module' in context:
-            name_id = 'model_'+self._name.replace('.','_')
-            cr.execute('select * from ir_model_data where name=%s and res_id=%s and module=%s', (name_id,model_id,context['module']))
+            name_id = 'model_'+self._name.replace('.', '_')
+            cr.execute('select * from ir_model_data where name=%s and res_id=%s and module=%s', (name_id, model_id, context['module']))
             if not cr.rowcount:
                 cr.execute("INSERT INTO ir_model_data (name,date_init,date_update,module,model,res_id) VALUES (%s, now(), now(), %s, %s, %s)", \
                     (name_id, context['module'], 'ir.model', model_id)
@@ -434,17 +433,17 @@ class orm_template(object):
                 'relation': f._obj or '',
                 'view_load': (f.view_load and 1) or 0,
                 'select_level': tools.ustr(f.select or 0),
-                'readonly':(f.readonly and 1) or 0,
-                'required':(f.required and 1) or 0,
-                'selectable' : (f.selectable and 1) or 0,
-                'relation_field': (f._type=='one2many' and isinstance(f,fields.one2many)) and f._fields_id or '',
+                'readonly': (f.readonly and 1) or 0,
+                'required': (f.required and 1) or 0,
+                'selectable': (f.selectable and 1) or 0,
+                'relation_field': (f._type=='one2many' and isinstance(f, fields.one2many)) and f._fields_id or '',
             }
             # When its a custom field,it does not contain f.select
-            if context.get('field_state','base') == 'manual':
-                if context.get('field_name','') == k:
-                    vals['select_level'] = context.get('select','0')
+            if context.get('field_state', 'base') == 'manual':
+                if context.get('field_name', '') == k:
+                    vals['select_level'] = context.get('select', '0')
                 #setting value to let the problem NOT occur next time
-                else:
+                elif k in cols:
                     vals['select_level'] = cols[k]['select_level']
 
             if k not in cols:
@@ -459,7 +458,7 @@ class orm_template(object):
                 )""", (
                     id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'],
                      vals['relation'], bool(vals['view_load']), 'base',
-                    vals['select_level'],vals['relation_field']
+                    vals['select_level'], vals['relation_field']
                 ))
                 if 'module' in context:
                     name1 = 'field_' + self._table + '_' + k
@@ -481,7 +480,7 @@ class orm_template(object):
                             model=%s AND name=%s""", (
                                 vals['model_id'], vals['field_description'], vals['ttype'],
                                 vals['relation'], bool(vals['view_load']),
-                                vals['select_level'], bool(vals['readonly']),bool(vals['required']),bool(vals['selectable']),vals['relation_field'],vals['model'], vals['name']
+                                vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], vals['model'], vals['name']
                             ))
                         continue
         cr.commit()
@@ -495,8 +494,8 @@ class orm_template(object):
             msg = "The class %s has to have a _name attribute" % name
 
             logger = netsvc.Logger()
-            logger.notifyChannel('orm', netsvc.LOG_ERROR, msg )
-            raise except_orm('ValueError', msg )
+            logger.notifyChannel('orm', netsvc.LOG_ERROR, msg)
+            raise except_orm('ValueError', msg)
 
         if not self._description:
             self._description = self._name
@@ -563,11 +562,11 @@ class orm_template(object):
                         r = r['id']
                     elif f[i] == 'id':
                         model_data = self.pool.get('ir.model.data')
-                        data_ids = model_data.search(cr, uid, [('model','=',r._table_name),('res_id','=',r['id'])])
+                        data_ids = model_data.search(cr, uid, [('model', '=', r._table_name), ('res_id', '=', r['id'])])
                         if len(data_ids):
-                            d = model_data.read(cr, uid, data_ids, ['name','module'])[0]
+                            d = model_data.read(cr, uid, data_ids, ['name', 'module'])[0]
                             if d['module']:
-                                r = '%s.%s'%(d['module'],d['name'])
+                                r = '%s.%s' % (d['module'], d['name'])
                             else:
                                 r = d['name']
                         else:
@@ -575,7 +574,7 @@ class orm_template(object):
                     else:
                         r = r[f[i]]
                         # To display external name of selection field when its exported
-                        if not context.get('import_comp',False):# Allow external name only if its not import compatible
+                        if not context.get('import_comp', False):# Allow external name only if its not import compatible
                             cols = False
                             if f[i] in self._columns.keys():
                                 cols = self._columns[f[i]]
@@ -609,7 +608,7 @@ class orm_template(object):
                                         data[fpos2] = lines2[0][fpos2]
                                 if not data[fpos]:
                                     dt = ''
-                                    for rr in r :
+                                    for rr in r:
                                         if isinstance(rr.name, browse_record):
                                             rr = rr.name
                                         rr_name = self.pool.get(rr._table_name).name_get(cr, uid, [rr.id], context=context)
@@ -646,31 +645,31 @@ class orm_template(object):
         """
         if context is None:
             context = {}
-        imp_comp = context.get('import_comp',False)
+        imp_comp = context.get('import_comp', False)
         cols = self._columns.copy()
         for f in self._inherit_fields:
             cols.update({f: self._inherit_fields[f][2]})
         fields_to_export = map(lambda x: x.split('/'), fields_to_export)
-        fields_export = fields_to_export+[]
+        fields_export = fields_to_export + []
         warning = ''
         warning_fields = []
         for field in fields_export:
-            if imp_comp and len(field)>1:
-                warning_fields.append('/'.join(map(lambda x:x in cols and cols[x].string or x,field)))
-            elif len (field) <=1:
-                if imp_comp and cols.get(field and field[0],False):
+            if imp_comp and len(field) > 1:
+                warning_fields.append('/'.join(map(lambda x: x in cols and cols[x].string or x,field)))
+            elif len (field) <= 1:
+                if imp_comp and cols.get(field and field[0], False):
                     if ((isinstance(cols[field[0]], fields.function) and not cols[field[0]].store) \
                                      or isinstance(cols[field[0]], fields.related)\
                                      or isinstance(cols[field[0]], fields.one2many)):
-                        warning_fields.append('/'.join(map(lambda x:x in cols and cols[x].string or x,field)))
+                        warning_fields.append('/'.join(map(lambda x: x in cols and cols[x].string or x,field)))
         datas = []
         if imp_comp and len(warning_fields):
-            warning = 'Following columns cannot be exported since you select to be import compatible.\n%s' %('\n'.join(warning_fields))
+            warning = 'Following columns cannot be exported since you select to be import compatible.\n%s' % ('\n'.join(warning_fields))
             cr.rollback()
-            return {'warning' : warning}
+            return {'warning': warning}
         for row in self.browse(cr, uid, ids, context):
             datas += self.__export_row(cr, uid, row, fields_to_export, context)
-        return {'datas':datas}
+        return {'datas': datas}
 
     def import_data(self, cr, uid, fields, datas, mode='init', current_module='', noupdate=False, context=None, filename=None):
         """
@@ -699,7 +698,7 @@ class orm_template(object):
 
         def _check_db_id(self, model_name, db_id):
             obj_model = self.pool.get(model_name)
-            ids = obj_model.search(cr, uid, [('id','=',int(db_id))])
+            ids = obj_model.search(cr, uid, [('id', '=', int(db_id))])
             if not len(ids):
                 raise Exception(_("Database ID doesn't exist: %s : %s") %(model_name, db_id))
             return True
@@ -730,28 +729,28 @@ class orm_template(object):
 
                 if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':db_id'):
                         # Database ID
-                        res = False
-                        if line[i]:
-                            field_name = field[0].split(':')[0]
-                            model_rel =  fields_def[field_name]['relation']
+                    res = False
+                    if line[i]:
+                        field_name = field[0].split(':')[0]
+                        model_rel = fields_def[field_name]['relation']
 
-                            if fields_def[field[len(prefix)][:-6]]['type']=='many2many':
-                                res_id = []
-                                for db_id in line[i].split(config.get('csv_internal_sep')):
-                                    try:
-                                        _check_db_id(self, model_rel, db_id)
-                                        res_id.append(db_id)
-                                    except Exception,e:
-                                        warning += [tools.exception_to_unicode(e)]
-                                        logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                                  tools.exception_to_unicode(e))
-                                if len(res_id):
-                                    res = [(6, 0, res_id)]
+                        if fields_def[field[len(prefix)][:-6]]['type'] == 'many2many':
+                            res_id = []
+                            for db_id in line[i].split(config.get('csv_internal_sep')):
+                                try:
+                                    _check_db_id(self, model_rel, db_id)
+                                    res_id.append(db_id)
+                                except Exception, e:
+                                    warning += [tools.exception_to_unicode(e)]
+                                    logger.notifyChannel("import", netsvc.LOG_ERROR,
+                                              tools.exception_to_unicode(e))
+                            if len(res_id):
+                                res = [(6, 0, res_id)]
                             else:
                                 try:
                                     _check_db_id(self, model_rel, line[i])
                                     res = line[i]
-                                except Exception,e:
+                                except Exception, e:
                                     warning += [tools.exception_to_unicode(e)]
                                     logger.notifyChannel("import", netsvc.LOG_ERROR,
                                               tools.exception_to_unicode(e))
@@ -761,7 +760,7 @@ class orm_template(object):
                 if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':id'):
                     res_id = False
                     if line[i]:
-                        if fields_def[field[len(prefix)][:-3]]['type']=='many2many':
+                        if fields_def[field[len(prefix)][:-3]]['type'] == 'many2many':
                             res_id = []
                             for word in line[i].split(config.get('csv_internal_sep')):
                                 if '.' in word:
@@ -792,7 +791,7 @@ class orm_template(object):
                 if (len(field) == len(prefix)+1) and \
                         len(field[len(prefix)].split(':lang=')) == 2:
                     f, lang = field[len(prefix)].split(':lang=')
-                    translate.setdefault(lang, {})[f]=line[i] or False
+                    translate.setdefault(lang, {})[f] = line[i] or False
                     continue
                 if (len(field) == len(prefix)+1) and \
                         (prefix == field[0:len(prefix)]):
@@ -800,22 +799,22 @@ class orm_template(object):
                         # XML ID
                         db_id = False
                         is_xml_id = data_id = line[i]
-                        d =  data_id.split('.')
-                        module = len(d)>1 and d[0] or ''
-                        name = len(d)>1 and d[1] or d[0]
-                        data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('name','=',name)])
+                        d = data_id.split('.')
+                        module = len(d) > 1 and d[0] or ''
+                        name = len(d) > 1 and d[1] or d[0]
+                        data_ids = ir_model_data_obj.search(cr, uid, [('module', '=', module), ('model', '=', model_name), ('name', '=', name)])
                         if len(data_ids):
                             d = ir_model_data_obj.read(cr, uid, data_ids, ['res_id'])[0]
                             db_id = d['res_id']
                         if is_db_id and not db_id:
-                           data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('res_id','=',is_db_id)])
-                           if not len(data_ids):
-                               ir_model_data_obj.create(cr, uid, {'module':module, 'model':model_name, 'name':name, 'res_id':is_db_id})
-                               db_id = is_db_id
+                            data_ids = ir_model_data_obj.search(cr, uid, [('module', '=', module), ('model', '=', model_name), ('res_id', '=', is_db_id)])
+                            if not len(data_ids):
+                                ir_model_data_obj.create(cr, uid, {'module': module, 'model': model_name, 'name': name, 'res_id': is_db_id})
+                                db_id = is_db_id
                         if is_db_id and int(db_id) != int(is_db_id):
-                            warning += [_("Id is not the same than existing one: %s")%(is_db_id)]
+                            warning += [_("Id is not the same than existing one: %s") % (is_db_id)]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                    _("Id is not the same than existing one: %s")%(is_db_id))
+                                    _("Id is not the same than existing one: %s") % (is_db_id))
                         continue
 
                     if field[len(prefix)] == "db_id":
@@ -823,25 +822,25 @@ class orm_template(object):
                         try:
                             _check_db_id(self, model_name, line[i])
                             data_res_id = is_db_id = int(line[i])
-                        except Exception,e:
+                        except Exception, e:
                             warning += [tools.exception_to_unicode(e)]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
                                       tools.exception_to_unicode(e))
                             continue
-                        data_ids = ir_model_data_obj.search(cr, uid, [('model','=',model_name),('res_id','=',line[i])])
+                        data_ids = ir_model_data_obj.search(cr, uid, [('model', '=', model_name), ('res_id', '=', line[i])])
                         if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name','module'])[0]
+                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name', 'module'])[0]
                             data_id = d['name']
                             if d['module']:
-                                data_id = '%s.%s'%(d['module'],d['name'])
+                                data_id = '%s.%s' % (d['module'], d['name'])
                             else:
                                 data_id = d['name']
                         if is_xml_id and not data_id:
                             data_id = is_xml_id
-                        if is_xml_id and is_xml_id!=data_id:
-                            warning += [_("Id is not the same than existing one: %s")%(line[i])]
+                        if is_xml_id and is_xml_id != data_id:
+                            warning += [_("Id is not the same than existing one: %s") % (line[i])]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                    _("Id is not the same than existing one: %s")%(line[i]))
+                                    _("Id is not the same than existing one: %s") % (line[i]))
 
                         continue
                     if fields_def[field[len(prefix)]]['type'] == 'integer':
@@ -859,7 +858,7 @@ class orm_template(object):
                             sel = fields_def[field[len(prefix)]]['selection'](self,
                                     cr, uid, context)
                         for key, val in sel:
-                            if line[i] in [tools.ustr(key),tools.ustr(val)]: #Acepting key or value for selection field
+                            if line[i] in [tools.ustr(key), tools.ustr(val)]: #Acepting key or value for selection field
                                 res = key
                                 break
                         if line[i] and not res:
@@ -867,9 +866,9 @@ class orm_template(object):
                                     _("key '%s' not found in selection field '%s'") % \
                                             (line[i], field[len(prefix)]))
 
-                            warning += [_("Key/value '%s' not found in selection field '%s'")%(line[i],field[len(prefix)])]
+                            warning += [_("Key/value '%s' not found in selection field '%s'") % (line[i], field[len(prefix)])]
 
-                    elif fields_def[field[len(prefix)]]['type']=='many2one':
+                    elif fields_def[field[len(prefix)]]['type'] == 'many2one':
                         res = False
                         if line[i]:
                             relation = fields_def[field[len(prefix)]]['relation']
@@ -877,10 +876,10 @@ class orm_template(object):
                                     line[i], [], operator='=', context=context)
                             res = (res2 and res2[0][0]) or False
                             if not res:
-                                warning += [_("Relation not found: %s on '%s'")%(line[i],relation)]
+                                warning += [_("Relation not found: %s on '%s'") % (line[i], relation)]
                                 logger.notifyChannel("import", netsvc.LOG_WARNING,
-                                        _("Relation not found: %s on '%s'")%(line[i],relation))
-                    elif fields_def[field[len(prefix)]]['type']=='many2many':
+                                        _("Relation not found: %s on '%s'") % (line[i], relation))
+                    elif fields_def[field[len(prefix)]]['type'] == 'many2many':
                         res = []
                         if line[i]:
                             relation = fields_def[field[len(prefix)]]['relation']
@@ -889,10 +888,10 @@ class orm_template(object):
                                         uid, word, [], operator='=', context=context)
                                 res3 = (res2 and res2[0][0]) or False
                                 if not res3:
-                                    warning += [_("Relation not found: %s on '%s'")%(line[i],relation)]
+                                    warning += [_("Relation not found: %s on '%s'") % (line[i], relation)]
                                     logger.notifyChannel("import",
                                             netsvc.LOG_WARNING,
-                                            _("Relation not found: %s on '%s'")%(line[i],relation))
+                                            _("Relation not found: %s on '%s'") % (line[i], relation))
                                 else:
                                     res.append(res3)
                             if len(res):
@@ -919,7 +918,7 @@ class orm_template(object):
                 row[field] = (reduce(lambda x, y: x or y, newrow.values()) and \
                         [(0, 0, newrow)]) or []
                 i = max2
-                while (position+i)<len(datas):
+                while (position+i) < len(datas):
                     ok = True
                     for j in range(len(fields)):
                         field2 = fields[j]
@@ -930,13 +929,13 @@ class orm_template(object):
 
                     (newrow, max2, w2, translate2, data_id2, data_res_id2) = process_liness(
                             self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
-                    warning = warning+w2
+                    warning = warning + w2
                     if reduce(lambda x, y: x or y, newrow.values()):
                         row[field].append((0, 0, newrow))
                     i += max2
                     nbrmax = max(nbrmax, i)
 
-            if len(prefix)==0:
+            if len(prefix) == 0:
                 for i in range(max(nbrmax, 1)):
                     #if datas:
                     datas.pop(0)
@@ -949,7 +948,7 @@ class orm_template(object):
         initial_size = len(datas)
         if config.get('import_partial', False) and filename:
             data = pickle.load(file(config.get('import_partial')))
-            original_value =  data.get(filename, 0)
+            original_value = data.get(filename, 0)
         counter = 0
         while len(datas):
             counter += 1
@@ -969,27 +968,27 @@ class orm_template(object):
                 import psycopg2
                 import osv
                 cr.rollback()
-                if isinstance(e,psycopg2.IntegrityError):
-                    msg= _('Insertion Failed! ')
+                if isinstance(e, psycopg2.IntegrityError):
+                    msg = _('Insertion Failed! ')
                     for key in self.pool._sql_error.keys():
                         if key in e[0]:
                             msg = self.pool._sql_error[key]
                             break
-                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
-                if isinstance(e, osv.orm.except_orm ):
+                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '')
+                if isinstance(e, osv.orm.except_orm):
                     msg = _('Insertion Failed! ' + e[1])
-                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
+                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '')
                 #Raising Uncaught exception
-                return (-1, res, 'Line ' + str(counter) +' : ' + str(e), '' )
+                return (-1, res, 'Line ' + str(counter) +' : ' + str(e), '')
 
             for lang in translate:
                 context2 = context.copy()
                 context2['lang'] = lang
                 self.write(cr, uid, [id], translate[lang], context2)
-            if config.get('import_partial', False) and filename and (not (counter%100)) :
+            if config.get('import_partial', False) and filename and (not (counter%100)):
                 data = pickle.load(file(config.get('import_partial')))
                 data[filename] = initial_size - len(datas) + original_value
-                pickle.dump(data, file(config.get('import_partial'),'wb'))
+                pickle.dump(data, file(config.get('import_partial'), 'wb'))
                 if context.get('defer_parent_store_computation'):
                     self._parent_store_compute(cr)
                 cr.commit()
@@ -1012,7 +1011,7 @@ class orm_template(object):
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         raise NotImplementedError(_('The read method is not implemented on this object !'))
 
-    def get_invalid_fields(self,cr,uid):
+    def get_invalid_fields(self, cr, uid):
         return list(self._invalids)
 
     def _validate(self, cr, uid, ids, context=None):
@@ -1191,7 +1190,7 @@ class orm_template(object):
                 if not write_access:
                     res[f]['readonly'] = True
                     res[f]['states'] = {}
-                for arg in ('digits', 'invisible','filters'):
+                for arg in ('digits', 'invisible', 'filters'):
                     if getattr(self._columns[f], arg, None):
                         res[f][arg] = getattr(self._columns[f], arg)
 
@@ -1278,14 +1277,14 @@ class orm_template(object):
                 new_xml = etree.fromstring(encode(xml))
                 ctx = context.copy()
                 ctx['base_model_name'] = self._name
-                xarch, xfields = self.pool.get(node.get('object',False)).__view_look_dom_arch(cr, user, new_xml, view_id, ctx)
+                xarch, xfields = self.pool.get(node.get('object', False)).__view_look_dom_arch(cr, user, new_xml, view_id, ctx)
                 views[str(f.tag)] = {
                     'arch': xarch,
                     'fields': xfields
                 }
                 attrs = {'views': views}
                 view = False
-                fields = views.get('field',False) and views['field'].get('fields',False)
+                fields = views.get('field', False) and views['field'].get('fields', False)
             if node.get('name'):
                 attrs = {}
                 try:
@@ -1325,13 +1324,13 @@ class orm_template(object):
                         dom = []
                         if column._domain and not isinstance(column._domain, basestring):
                             dom = column._domain
-                        dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
+                        dom += eval(node.get('domain', '[]'), {'uid': user, 'time': time})
                         search_context = dict(context)
                         if column._context and not isinstance(column._context, basestring):
                             search_context.update(column._context)
                         attrs['selection'] = relation._name_search(cr, user, '', dom, context=search_context, limit=None, name_get_uid=1)
                         if (node.get('required') and not int(node.get('required'))) or not column.required:
-                            attrs['selection'].append((False,''))
+                            attrs['selection'].append((False, ''))
                 fields[node.get('name')] = attrs
 
         elif node.tag in ('form', 'tree'):
@@ -1350,13 +1349,13 @@ class orm_template(object):
         # translate view
         if ('lang' in context) and not result:
             if node.get('string'):
-                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('string').encode('utf8'))
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('string'))
                 if not trans and ('base_model_name' in context):
-                    trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string').encode('utf8'))
+                    trans = self.pool.get('ir.translation')._get_source(cr, user, context['base_model_name'], 'view', context['lang'], node.get('string'))
                 if trans:
                     node.set('string', trans)
             if node.get('sum'):
-                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum').encode('utf8'))
+                trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('sum'))
                 if trans:
                     node.set('sum', trans)
 
@@ -1375,7 +1374,7 @@ class orm_template(object):
         buttons = (n for n in node.getiterator('button') if n.get('type') != 'object')
         for button in buttons:
             can_click = True
-            if user != 1:   # admin user has all roles
+            if user != 1: # admin user has all roles
                 user_roles = usersobj.read(cr, user, [user], ['roles_id'])[0]['roles_id']
                 # TODO handle the case of more than one workflow for a model
                 cr.execute("""SELECT DISTINCT t.role_id
@@ -1407,16 +1406,16 @@ class orm_template(object):
 
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
 
-        fields={}
-        if node.tag=='diagram':
-            if node.getchildren()[0].tag=='node':
-               node_fields=self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, fields_def.keys(), context)
-            if node.getchildren()[1].tag=='arrow':
-               arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, fields_def.keys(), context)
-            for key,value in node_fields.items():
-                fields[key]=value
-            for key,value in arrow_fields.items():
-                fields[key]=value
+        fields = {}
+        if node.tag == 'diagram':
+            if node.getchildren()[0].tag == 'node':
+                node_fields = self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, fields_def.keys(), context)
+            if node.getchildren()[1].tag == 'arrow':
+                arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, fields_def.keys(), context)
+            for key, value in node_fields.items():
+                fields[key] = value
+            for key, value in arrow_fields.items():
+                fields[key] = value
         else:
             fields = self.fields_get(cr, user, fields_def.keys(), context)
         for field in fields_def:
@@ -1444,37 +1443,37 @@ class orm_template(object):
                 '<calendar string="%s"') % (self._description)
 
         if (self._date_name not in self._columns):
-                date_found = False
-                for dt in ['date','date_start','x_date','x_date_start']:
-                    if dt in self._columns:
-                        self._date_name = dt
-                        date_found = True
-                        break
+            date_found = False
+            for dt in ['date', 'date_start', 'x_date', 'x_date_start']:
+                if dt in self._columns:
+                    self._date_name = dt
+                    date_found = True
+                    break
 
-                if not date_found:
-                    raise except_orm(_('Invalid Object Architecture!'),_("Insufficient fields for Calendar View!"))
+            if not date_found:
+                raise except_orm(_('Invalid Object Architecture!'), _("Insufficient fields for Calendar View!"))
 
         if self._date_name:
-            arch +=' date_start="%s"' % (self._date_name)
+            arch += ' date_start="%s"' % (self._date_name)
 
-        for color in ["user_id","partner_id","x_user_id","x_partner_id"]:
+        for color in ["user_id", "partner_id", "x_user_id", "x_partner_id"]:
             if color in self._columns:
                 arch += ' color="' + color + '"'
                 break
 
         dt_stop_flag = False
 
-        for dt_stop in ["date_stop","date_end","x_date_stop","x_date_end"]:
+        for dt_stop in ["date_stop", "date_end", "x_date_stop", "x_date_end"]:
             if dt_stop in self._columns:
                 arch += ' date_stop="' + dt_stop + '"'
                 dt_stop_flag = True
                 break
 
         if not dt_stop_flag:
-            for dt_delay in ["date_delay","planned_hours","x_date_delay","x_planned_hours"]:
-               if dt_delay in self._columns:
-                   arch += ' date_delay="' + dt_delay + '"'
-                   break
+            for dt_delay in ["date_delay", "planned_hours", "x_date_delay", "x_planned_hours"]:
+                if dt_delay in self._columns:
+                    arch += ' date_delay="' + dt_delay + '"'
+                    break
 
         arch += ('>\n'
                  '  <field name="%s"/>\n'
@@ -1556,7 +1555,7 @@ class orm_template(object):
             # End: _find(node, node2)
 
             doc_dest = etree.fromstring(encode(inherit))
-            toparse = [ doc_dest ]
+            toparse = [doc_dest]
 
             while len(toparse):
                 node2 = toparse.pop(0)
@@ -1699,7 +1698,7 @@ class orm_template(object):
 
             else:
                 xml = '<?xml version="1.0"?>' # what happens here, graph case?
-                raise except_orm(_('Invalid Architecture!'),_("There is no view of type '%s' defined for the structure!") % view_type)
+                raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
             result['arch'] = etree.fromstring(encode(xml))
             result['name'] = 'default'
             result['field_parent'] = False
@@ -1710,13 +1709,13 @@ class orm_template(object):
         result['fields'] = xfields
 
         if submenu:
-            if context and context.get('active_id',False):
+            if context and context.get('active_id', False):
                 data_menu = self.pool.get('ir.ui.menu').browse(cr, user, context['active_id'], context).action
                 if data_menu:
                     act_id = data_menu.id
                     if act_id:
                         data_action = self.pool.get('ir.actions.act_window').browse(cr, user, [act_id], context)[0]
-                        result['submenu'] = getattr(data_action,'menus', False)
+                        result['submenu'] = getattr(data_action, 'menus', False)
         if toolbar:
             def clean(x):
                 x = x[2]
@@ -1743,7 +1742,7 @@ class orm_template(object):
             resprint = filter(lambda x: not x.get('multi', False), resprint)
             resrelate = map(lambda x: x[2], resrelate)
 
-            for x in resprint+resaction+resrelate:
+            for x in resprint + resaction + resrelate:
                 x['string'] = x['name']
 
             result['toolbar'] = {
@@ -1751,10 +1750,10 @@ class orm_template(object):
                 'action': resaction,
                 'relate': resrelate
             }
-        if result['type']=='form' and result['arch'].count("default_focus")>1:
-                msg = "Form View contain more than one default_focus attribute"
-                netsvc.Logger().notifyChannel('orm', netsvc.LOG_ERROR, msg)
-                raise except_orm('View Error !',msg)
+        if result['type'] == 'form' and result['arch'].count("default_focus") > 1:
+            msg = "Form View contain more than one default_focus attribute"
+            netsvc.Logger().notifyChannel('orm', netsvc.LOG_ERROR, msg)
+            raise except_orm('View Error !', msg)
         return result
 
     _view_look_dom_arch = __view_look_dom_arch
@@ -1946,8 +1945,8 @@ class orm_template(object):
             for dv in defaults:
                 # FIXME: also handle inherited m2m
                 if dv in self._columns and self._columns[dv]._type == 'many2many' \
-                     and defaults[dv] and isinstance(defaults[dv][0], (int, long)):
-                        defaults[dv] = [(6, 0, defaults[dv])]
+                        and defaults[dv] and isinstance(defaults[dv][0], (int, long)):
+                    defaults[dv] = [(6, 0, defaults[dv])]
             defaults.update(values)
             values = defaults
         return values
@@ -1981,7 +1980,7 @@ class orm_memory(orm_template):
             if self.datas[id]['internal.date_access'] < max:
                 tounlink.append(id)
         self.unlink(cr, 1, tounlink)
-        if len(self.datas)>self._max_count:
+        if len(self.datas) > self._max_count:
             sorted = map(lambda x: (x[1]['internal.date_access'], x[0]), self.datas.items())
             sorted.sort()
             ids = map(lambda x: x[1], sorted[:len(self.datas)-self._max_count])
@@ -2075,7 +2074,7 @@ class orm_memory(orm_template):
         if not context:
             context = {}
         args = args[:]
-        res=[]
+        res = []
         # if the object has a field named 'active', filter out all inactive
         # records unless they were explicitely asked for
         if 'active' in self._columns and (active_test and context.get('active_test', True)):
@@ -2106,16 +2105,16 @@ class orm_memory(orm_template):
             args.insert(0, ('internal.create_uid', '=', user))
 
         result = self._where_calc(cr, user, args, context=context)
-        if result==[]:
+        if result == []:
             return self.datas.keys()
 
-        res=[]
-        counter=0
+        res = []
+        counter = 0
         #Find the value of dict
-        f=False
+        f = False
         if result:
             for id, data in self.datas.items():
-                counter=counter+1
+                counter = counter + 1
                 data['id'] = id
                 if limit and (counter > int(limit)):
                     break
@@ -2123,7 +2122,7 @@ class orm_memory(orm_template):
                 for arg in result:
                     if arg[1] == '=':
                         val = eval('data[arg[0]]'+'==' +' arg[2]', locals())
-                    elif arg[1] in ['<','>','in','not in','<=','>=','<>']:
+                    elif arg[1] in ['<', '>', 'in', 'not in', '<=', '>=', '<>']:
                         val = eval('data[arg[0]]'+arg[1] +' arg[2]', locals())
                     elif arg[1] in ['ilike']:
                         val = (str(data[arg[0]]).find(str(arg[2]))!=-1)
@@ -2169,8 +2168,9 @@ class orm_memory(orm_template):
 class orm(orm_template):
     _sql_constraints = []
     _table = None
-    _protected = ['read','write','create','default_get','perm_read','unlink','fields_get','fields_view_get','search','name_get','distinct_field_get','name_search','copy','import_data','search_count', 'exists']
-
+    _protected = ['read', 'write', 'create', 'default_get', 'perm_read', 'unlink', 'fields_get', 'fields_view_get', 'search', 'name_get', 'distinct_field_get', 'name_search', 'copy', 'import_data', 'search_count', 'exists']
+    __logger = logging.getLogger('orm')
+    __schema = logging.getLogger('orm.schema')
     def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
         """
         Get the list of records in list view grouped by the given ``groupby`` fields
@@ -2220,25 +2220,25 @@ class orm(orm_template):
         if groupby:
             if groupby and isinstance(groupby, list):
                 groupby = groupby[0]
-            tables, where_clause, qfield = self._inherits_join_calc(groupby,tables,where_clause)
+            tables, where_clause, qfield = self._inherits_join_calc(groupby, tables, where_clause)
 
         if len(where_clause):
-            where_clause = ' where '+string.join(where_clause, ' and ')
+            where_clause = ' where ' + ' and '.join(where_clause)
         else:
             where_clause = ''
         limit_str = limit and ' limit %d' % limit or ''
         offset_str = offset and ' offset %d' % offset or ''
 
         fget = self.fields_get(cr, uid, fields)
-        float_int_fields = filter(lambda x: fget[x]['type'] in ('float','integer'), fields)
+        float_int_fields = filter(lambda x: fget[x]['type'] in ('float', 'integer'), fields)
         sum = {}
 
         flist = ''
         group_by = groupby
         if groupby:
-            if fget.get(groupby,False) and fget[groupby]['type'] in ('date','datetime'):
-                flist = "to_char(%s,'yyyy-mm') as %s "%(groupby,groupby)
-                groupby = "to_char(%s,'yyyy-mm')"%(groupby)
+            if fget.get(groupby, False) and fget[groupby]['type'] in ('date', 'datetime'):
+                flist = "to_char(%s,'yyyy-mm') as %s " % (groupby, groupby)
+                groupby = "to_char(%s,'yyyy-mm')" % (groupby)
             else:
                 flist = groupby
 
@@ -2247,8 +2247,8 @@ class orm(orm_template):
                    f == self.CONCURRENCY_CHECK_FIELD
                 or (f in self._columns and getattr(self._columns[f], '_classic_write'))]
         for f in fields_pre:
-            if f not in ['id','sequence']:
-                operator = fget[f].get('group_operator','sum')
+            if f not in ['id', 'sequence']:
+                operator = fget[f].get('group_operator', 'sum')
                 if flist:
                     flist += ','
                 flist += operator+'('+f+') as '+f
@@ -2261,25 +2261,25 @@ class orm(orm_template):
         alldata = {}
         groupby = group_by
         for r in cr.dictfetchall():
-            for fld,val in r.items():
-                if val == None:r[fld] = False
+            for fld, val in r.items():
+                if val == None: r[fld] = False
             alldata[r['id']] = r
             del r['id']
         data = self.read(cr, uid, alldata.keys(), groupby and [groupby] or ['id'], context=context)
         for d in data:
             if groupby:
-                d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
-                if not isinstance(groupby_list,(str, unicode)):
+                d['__domain'] = [(groupby, '=', alldata[d['id']][groupby] or False)] + domain
+                if not isinstance(groupby_list, (str, unicode)):
                     if groupby or not context.get('group_by_no_leaf', False):
-                        d['__context'] = {'group_by':groupby_list[1:]}
-            if groupby and fget.has_key(groupby):
-                if d[groupby] and fget[groupby]['type'] in ('date','datetime'):
-                    dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7],'%Y-%m')
+                        d['__context'] = {'group_by': groupby_list[1:]}
+            if groupby and groupby in fget:
+                if d[groupby] and fget[groupby]['type'] in ('date', 'datetime'):
+                    dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7], '%Y-%m')
                     days = calendar.monthrange(dt.year, dt.month)[1]
 
-                    d[groupby] = datetime.datetime.strptime(d[groupby][:10],'%Y-%m-%d').strftime('%B %Y')
-                    d['__domain'] = [(groupby,'>=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01','%Y-%m-%d').strftime('%Y-%m-%d') or False),\
-                                     (groupby,'<=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days),'%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
+                    d[groupby] = datetime.datetime.strptime(d[groupby][:10], '%Y-%m-%d').strftime('%B %Y')
+                    d['__domain'] = [(groupby, '>=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01', '%Y-%m-%d').strftime('%Y-%m-%d') or False),\
+                                     (groupby, '<=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days), '%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
                 del alldata[d['id']][groupby]
             d.update(alldata[d['id']])
             del d['id']
@@ -2327,7 +2327,7 @@ class orm(orm_template):
         if not self._parent_store:
             return
         logger = netsvc.Logger()
-        logger.notifyChannel('orm', netsvc.LOG_INFO, 'Computing parent left and right for table %s...' % (self._table, ))
+        logger.notifyChannel('data', netsvc.LOG_INFO, 'Computing parent left and right for table %s...' % (self._table, ))
         def browse_rec(root, pos=0):
 # TODO: set order
             where = self._parent_name+'='+str(root)
@@ -2340,11 +2340,11 @@ class orm(orm_template):
             childs = cr.fetchall()
             for id in childs:
                 pos2 = browse_rec(id[0], pos2)
-            cr.execute('update '+self._table+' set parent_left=%s, parent_right=%s where id=%s', (pos,pos2,root))
-            return pos2+1
+            cr.execute('update '+self._table+' set parent_left=%s, parent_right=%s where id=%s', (pos, pos2, root))
+            return pos2 + 1
         query = 'SELECT id FROM '+self._table+' WHERE '+self._parent_name+' IS NULL'
         if self._parent_order:
-            query += ' order by '+self._parent_order
+            query += ' order by ' + self._parent_order
         pos = 0
         cr.execute(query)
         for (root,) in cr.fetchall():
@@ -2353,7 +2353,7 @@ class orm(orm_template):
 
     def _update_store(self, cr, f, k):
         logger = netsvc.Logger()
-        logger.notifyChannel('orm', netsvc.LOG_INFO, "storing computed values of fields.function '%s'" % (k,))
+        logger.notifyChannel('data', netsvc.LOG_INFO, "storing computed values of fields.function '%s'" % (k,))
         ss = self._columns[k]._symbol_set
         update_query = 'UPDATE "%s" SET "%s"=%s WHERE id=%%s' % (self._table, k, ss[0])
         cr.execute('select id from '+self._table)
@@ -2362,17 +2362,16 @@ class orm(orm_template):
             iids = ids_lst[:40]
             ids_lst = ids_lst[40:]
             res = f.get(cr, self, iids, k, 1, {})
-            for key,val in res.items():
+            for key, val in res.items():
                 if f._multi:
                     val = val[k]
                 # if val is a many2one, just write the ID
-                if type(val)==tuple:
+                if type(val) == tuple:
                     val = val[0]
                 if (val<>False) or (type(val)<>bool):
                     cr.execute(update_query, (ss[1](val), key))
 
     def _check_removed_columns(self, cr, log=False):
-        logger = netsvc.Logger()
         # iterate on the database columns to drop the NOT NULL constraints
         # of fields which were required but have been removed (or will be added by another module)
         columns = [c for c in self._columns if not (isinstance(self._columns[c], fields.function) and not self._columns[c].store)]
@@ -2383,26 +2382,31 @@ class orm(orm_template):
                    "   AND c.oid=a.attrelid"
                    "   AND a.attisdropped=%s"
                    "   AND pg_catalog.format_type(a.atttypid, a.atttypmod) NOT IN ('cid', 'tid', 'oid', 'xid')"
-                   "   AND a.attname NOT IN %s" ,(self._table, False, tuple(columns))),
+                   "   AND a.attname NOT IN %s", (self._table, False, tuple(columns))),
 
         for column in cr.dictfetchall():
             if log:
-                logger.notifyChannel("orm", netsvc.LOG_DEBUG, "column %s is in the table %s but not in the corresponding object %s" % (column['attname'], self._table, self._name))
+                self.__logger.debug("column %s is in the table %s but not in the corresponding object %s",
+                                    column['attname'], self._table, self._name)
             if column['attnotnull']:
                 cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" DROP NOT NULL' % (self._table, column['attname']))
+                self.__schema.debug("Table '%s': column '%s': dropped NOT NULL constraint",
+                                    self._table, column['attname'])
 
     def _auto_init(self, cr, context={}):
-        store_compute =  False
-        logger = netsvc.Logger()
+        store_compute = False
         create = False
         todo_end = []
         self._field_create(cr, context=context)
         if getattr(self, '_auto', True):
-            cr.execute("SELECT relname FROM pg_class WHERE relkind IN ('r','v') AND relname=%s" ,( self._table,))
+            cr.execute("SELECT relname FROM pg_class WHERE relkind IN ('r','v') AND relname=%s", (self._table,))
             if not cr.rowcount:
                 cr.execute('CREATE TABLE "%s" (id SERIAL NOT NULL, PRIMARY KEY(id)) WITHOUT OIDS' % (self._table,))
-                cr.execute("COMMENT ON TABLE \"%s\" IS '%s'" % (self._table, self._description.replace("'","''")))
+                cr.execute("COMMENT ON TABLE \"%s\" IS '%s'" % (self._table, self._description.replace("'", "''")))
                 create = True
+
+                self.__schema.debug("Table '%s': created", self._table)
+
             cr.commit()
             if self._parent_store:
                 cr.execute("""SELECT c.relname
@@ -2410,14 +2414,22 @@ class orm(orm_template):
                     WHERE c.relname=%s AND a.attname=%s AND c.oid=a.attrelid
                     """, (self._table, 'parent_left'))
                 if not cr.rowcount:
-                    if 'parent_left' not in self._columns:
-                        logger.notifyChannel('orm', netsvc.LOG_ERROR, 'create a column parent_left on object %s: fields.integer(\'Left Parent\', select=1)' % (self._table, ))
-                    if 'parent_right' not in self._columns:
-                        logger.notifyChannel('orm', netsvc.LOG_ERROR, 'create a column parent_right on object %s: fields.integer(\'Right Parent\', select=1)' % (self._table, ))
-                    if self._columns[self._parent_name].ondelete != 'cascade':
-                        logger.notifyChannel('orm', netsvc.LOG_ERROR, "The column %s on object %s must be set as ondelete='cascade'" % (self._parent_name, self._name))
                     cr.execute('ALTER TABLE "%s" ADD COLUMN "parent_left" INTEGER' % (self._table,))
                     cr.execute('ALTER TABLE "%s" ADD COLUMN "parent_right" INTEGER' % (self._table,))
+                    if 'parent_left' not in self._columns:
+                        self.__logger.error('create a column parent_left on object %s: fields.integer(\'Left Parent\', select=1)',
+                                            self._table)
+                        self.__schema.debug("Table '%s': added column '%s' with definition=%s",
+                                            self._table, 'parent_left', 'INTEGER')
+                    if 'parent_right' not in self._columns:
+                        self.__logger.error('create a column parent_right on object %s: fields.integer(\'Right Parent\', select=1)',
+                                            self._table)
+                        self.__schema.debug("Table '%s': added column '%s' with definition=%s",
+                                            self._table, 'parent_right', 'INTEGER')
+                    if self._columns[self._parent_name].ondelete != 'cascade':
+                        self.__logger.error("The column %s on object %s must be set as ondelete='cascade'",
+                                            self._parent_name, self._name)
+
                     cr.commit()
                     store_compute = True
 
@@ -2437,6 +2449,8 @@ class orm(orm_template):
                     if not cr.rowcount:
                         cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, logs[k]))
                         cr.commit()
+                        self.__schema.debug("Table '%s': added column '%s' with definition=%s",
+                                            self._table, k, logs[k])
 
             self._check_removed_columns(cr, log=False)
 
@@ -2458,13 +2472,15 @@ class orm(orm_template):
                     if self.pool.get(f._obj):
                         if f._fields_id not in self.pool.get(f._obj)._columns.keys():
                             if not self.pool.get(f._obj)._inherits or (f._fields_id not in self.pool.get(f._obj)._inherit_fields.keys()):
-                                raise except_orm('Programming Error', ("There is no reference field '%s' found for '%s'") % (f._fields_id,f._obj,))
+                                raise except_orm('Programming Error', ("There is no reference field '%s' found for '%s'") % (f._fields_id, f._obj,))
 
                     if cr.fetchone():
                         cr.execute("SELECT count(1) as c FROM pg_class c,pg_attribute a WHERE c.relname=%s AND a.attname=%s AND c.oid=a.attrelid", (f._obj, f._fields_id))
                         res = cr.fetchone()[0]
                         if not res:
                             cr.execute('ALTER TABLE "%s" ADD FOREIGN KEY (%s) REFERENCES "%s" ON DELETE SET NULL' % (self._obj, f._fields_id, f._table))
+                            self.__schema.debug("Table '%s': added foreign key '%s' with definition=REFERENCES \"%s\" ON DELETE SET NULL",
+                                self._obj, f._fields_id, f._table)
                 elif isinstance(f, fields.many2many):
                     cr.execute("SELECT relname FROM pg_class WHERE relkind IN ('r','v') AND relname=%s", (f._rel,))
                     if not cr.dictfetchall():
@@ -2477,6 +2493,8 @@ class orm(orm_template):
                         cr.execute('CREATE INDEX "%s_%s_index" ON "%s" ("%s")' % (f._rel, f._id2, f._rel, f._id2))
                         cr.execute("COMMENT ON TABLE \"%s\" IS 'RELATION BETWEEN %s AND %s'" % (f._rel, self._table, ref))
                         cr.commit()
+                        self.__schema.debug("Create table '%s': relation between '%s' and '%s'",
+                                            f._rel, self._table, ref)
                 else:
                     cr.execute("SELECT c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE WHEN a.attlen=-1 THEN a.atttypmod-4 ELSE a.attlen END as size " \
                                "FROM pg_class c,pg_attribute a,pg_type t " \
@@ -2485,7 +2503,7 @@ class orm(orm_template):
                                "AND c.oid=a.attrelid " \
                                "AND a.atttypid=t.oid", (self._table, k))
                     res = cr.dictfetchall()
-                    if not res and hasattr(f,'oldname'):
+                    if not res and hasattr(f, 'oldname'):
                         cr.execute("SELECT c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE WHEN a.attlen=-1 THEN a.atttypmod-4 ELSE a.attlen END as size " \
                             "FROM pg_class c,pg_attribute a,pg_type t " \
                             "WHERE c.relname=%s " \
@@ -2493,23 +2511,26 @@ class orm(orm_template):
                             "AND c.oid=a.attrelid " \
                             "AND a.atttypid=t.oid", (self._table, f.oldname))
                         res_old = cr.dictfetchall()
-                        logger.notifyChannel('orm', netsvc.LOG_DEBUG, 'trying to rename %s(%s) to %s'% (self._table, f.oldname, k))
-                        if res_old and len(res_old)==1:
-                            cr.execute('ALTER TABLE "%s" RENAME "%s" TO "%s"' % ( self._table,f.oldname, k))
+                        if res_old and len(res_old) == 1:
+                            cr.execute('ALTER TABLE "%s" RENAME "%s" TO "%s"' % (self._table, f.oldname, k))
                             res = res_old
                             res[0]['attname'] = k
+                            self.__schema.debug("Table '%s': renamed column '%s' to '%s'",
+                                                self._table, f.oldname, k)
 
-
-                    if len(res)==1:
+                    if len(res) == 1:
                         f_pg_def = res[0]
                         f_pg_type = f_pg_def['typname']
                         f_pg_size = f_pg_def['size']
                         f_pg_notnull = f_pg_def['attnotnull']
                         if isinstance(f, fields.function) and not f.store and\
                                 not getattr(f, 'nodrop', False):
-                            logger.notifyChannel('orm', netsvc.LOG_INFO, 'column %s (%s) in table %s removed: converted to a function !\n' % (k, f.string, self._table))
-                            cr.execute('ALTER TABLE "%s" DROP COLUMN "%s" CASCADE'% (self._table, k))
+                            self.__logger.info('column %s (%s) in table %s removed: converted to a function !\n',
+                                               k, f.string, self._table)
+                            cr.execute('ALTER TABLE "%s" DROP COLUMN "%s" CASCADE' % (self._table, k))
                             cr.commit()
+                            self.__schema.debug("Table '%s': dropped column '%s' with cascade",
+                                                 self._table, k)
                             f_obj_type = None
                         else:
                             f_obj_type = get_pg_type(f) and get_pg_type(f)[0]
@@ -2526,23 +2547,24 @@ class orm(orm_template):
                                 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                             ]
                             if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:
-                                logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed size" % (k, self._table))
                                 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
                                 cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" VARCHAR(%d)' % (self._table, k, f.size))
                                 cr.execute('UPDATE "%s" SET "%s"=temp_change_size::VARCHAR(%d)' % (self._table, k, f.size))
                                 cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
                                 cr.commit()
+                                self.__schema.debug("Table '%s': column '%s' (type varchar) changed size from %s to %s",
+                                    self._table, k, f_pg_size, f.size)
                             for c in casts:
                                 if (f_pg_type==c[0]) and (f._type==c[1]):
                                     if f_pg_type != f_obj_type:
-                                        if f_pg_type != f_obj_type:
-                                            logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed type to %s." % (k, self._table, c[1]))
                                         ok = True
                                         cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
                                         cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, c[2]))
                                         cr.execute(('UPDATE "%s" SET "%s"=temp_change_size'+c[3]) % (self._table, k))
                                         cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
                                         cr.commit()
+                                        self.__schema.debug("Table '%s': column '%s' changed type from %s to %s",
+                                            self._table, k, c[0], c[1])
                                     break
 
                             if f_pg_type != f_obj_type:
@@ -2556,13 +2578,14 @@ class orm(orm_template):
                                             "AND c.oid=a.attrelid ", (self._table, newname))
                                         if not cr.fetchone()[0]:
                                             break
-                                        i+=1
-                                    logger.notifyChannel('orm', netsvc.LOG_WARNING, "column '%s' in table '%s' has changed type (DB=%s, def=%s), data moved to table %s !" % (k, self._table, f_pg_type, f._type, newname))
+                                        i += 1
                                     if f_pg_notnull:
                                         cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" DROP NOT NULL' % (self._table, k))
                                     cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO "%s"' % (self._table, k, newname))
                                     cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, get_pg_type(f)[1]))
-                                    cr.execute("COMMENT ON COLUMN %s.%s IS '%s'" % (self._table, k, f.string.replace("'","''")))
+                                    cr.execute("COMMENT ON COLUMN %s.%s IS '%s'" % (self._table, k, f.string.replace("'", "''")))
+                                    self.__schema.debug("Table '%s': column '%s' has changed type (DB=%s, def=%s), data moved to column %s !",
+                                        self._table, k, f_pg_type, f._type, newname)
 
                             # if the field is required and hasn't got a NOT NULL constraint
                             if f.required and f_pg_notnull == 0:
@@ -2582,13 +2605,19 @@ class orm(orm_template):
                                 try:
                                     cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" SET NOT NULL' % (self._table, k))
                                     cr.commit()
+                                    self.__schema.debug("Table '%s': column '%s': added NOT NULL constraint",
+                                                        self._table, k)
                                 except Exception:
-                                    logger.notifyChannel('orm', netsvc.LOG_WARNING, 'unable to set a NOT NULL constraint on column %s of the %s table !\nIf you want to have it, you should update the records and execute manually:\nALTER TABLE %s ALTER COLUMN %s SET NOT NULL' % (k, self._table, self._table, k))
+                                    msg = "Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+                                        "If you want to have it, you should update the records and execute manually:\n"\
+                                        "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL"
+                                    self.__schema.warn(msg, self._table, k, self._table, k)
                                 cr.commit()
                             elif not f.required and f_pg_notnull == 1:
                                 cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" DROP NOT NULL' % (self._table, k))
                                 cr.commit()
-
+                                self.__schema.debug("Table '%s': column '%s': dropped NOT NULL constraint",
+                                                    self._table, k)
                             # Verify index
                             indexname = '%s_%s_index' % (self._table, k)
                             cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = %s and tablename = %s", (indexname, self._table))
@@ -2598,13 +2627,16 @@ class orm(orm_template):
                                 cr.commit()
                                 if f._type == 'text':
                                     # FIXME: for fields.text columns we should try creating GIN indexes instead (seems most suitable for an ERP context)
-                                    logger.notifyChannel('orm', netsvc.LOG_WARNING, "Adding (b-tree) index for text column '%s' in table '%s'."\
-                                        "This is probably useless (does not work for fulltext search) and prevents INSERTs of long texts because there is a length limit for indexable btree values!\n"\
-                                        "Use a search view instead if you simply want to make the field searchable." % (k, f._type, self._table))
+                                    msg = "Table '%s': Adding (b-tree) index for text column '%s'."\
+                                        "This is probably useless (does not work for fulltext search) and prevents INSERTs of long texts"\
+                                        " because there is a length limit for indexable btree values!\n"\
+                                        "Use a search view instead if you simply want to make the field searchable."
+                                    self.__schema.warn(msg, self._table, k, f._type)
                             if res2 and not f.select:
                                 cr.execute('DROP INDEX "%s_%s_index"' % (self._table, k))
                                 cr.commit()
-                                logger.notifyChannel('orm', netsvc.LOG_WARNING, "Dropping index for column '%s' of type '%s' in table '%s' as it is not required anymore" % (k, f._type, self._table))
+                                msg = "Table '%s': dropping index for column '%s' of type '%s' as it is not required anymore"
+                                self.__schema.warn(msg, self._table, k, f._type)
 
                             if isinstance(f, fields.many2one):
                                 ref = self.pool.get(f._obj)._table
@@ -2630,14 +2662,17 @@ class orm(orm_template):
                                             cr.execute('ALTER TABLE "' + self._table + '" DROP CONSTRAINT "' + res2[0]['conname'] + '"')
                                             cr.execute('ALTER TABLE "' + self._table + '" ADD FOREIGN KEY ("' + k + '") REFERENCES "' + ref + '" ON DELETE ' + f.ondelete)
                                             cr.commit()
-                    elif len(res)>1:
-                        logger.notifyChannel('orm', netsvc.LOG_ERROR, "Programming error, column %s->%s has multiple instances !"%(self._table,k))
+                                            self.__schema.debug("Table '%s': column '%s': XXX",
+                                                self._table, k)
+                    elif len(res) > 1:
+                        netsvc.Logger().notifyChannel('orm', netsvc.LOG_ERROR, "Programming error, column %s->%s has multiple instances !" % (self._table, k))
                     if not res:
                         if not isinstance(f, fields.function) or f.store:
-
                             # add the missing field
                             cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, get_pg_type(f)[1]))
-                            cr.execute("COMMENT ON COLUMN %s.%s IS '%s'" % (self._table, k, f.string.replace("'","''")))
+                            cr.execute("COMMENT ON COLUMN %s.%s IS '%s'" % (self._table, k, f.string.replace("'", "''")))
+                            self.__schema.debug("Table '%s': added column '%s' with definition=%s",
+                                self._table, k, get_pg_type(f)[1])
 
                             # initialize it
                             if not create and k in self._defaults:
@@ -2650,15 +2685,13 @@ class orm(orm_template):
                                 query = 'UPDATE "%s" SET "%s"=%s' % (self._table, k, ss[0])
                                 cr.execute(query, (ss[1](default),))
                                 cr.commit()
-                                logger.notifyChannel('orm', netsvc.LOG_DEBUG, 'setting default value of new column %s of table %s'% (k, self._table))
-                            elif not create:
-                                logger.notifyChannel('orm', netsvc.LOG_DEBUG, 'creating new column %s of table %s'% (k, self._table))
+                                netsvc.Logger().notifyChannel('data', netsvc.LOG_DEBUG, "Table '%s': setting default value of new column %s" % (self._table, k))
 
                             if isinstance(f, fields.function):
                                 order = 10
                                 if f.store is not True:
                                     order = f.store[f.store.keys()[0]][2]
-                                todo_update_store.append((order, f,k))
+                                todo_update_store.append((order, f, k))
 
                             # and add constraints if needed
                             if isinstance(f, fields.many2one):
@@ -2669,16 +2702,24 @@ class orm(orm_template):
                                 # ir_actions is inherited so foreign key doesn't work on it
                                 if ref != 'ir_actions':
                                     cr.execute('ALTER TABLE "%s" ADD FOREIGN KEY ("%s") REFERENCES "%s" ON DELETE %s' % (self._table, k, ref, f.ondelete))
+                                    self.__schema.debug("Table '%s': added foreign key '%s' with definition=REFERENCES \"%s\" ON DELETE %s",
+                                        self._table, k, ref, f.ondelete)
                             if f.select:
                                 cr.execute('CREATE INDEX "%s_%s_index" ON "%s" ("%s")' % (self._table, k, self._table, k))
                             if f.required:
                                 try:
                                     cr.commit()
                                     cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" SET NOT NULL' % (self._table, k))
+                                    self.__schema.debug("Table '%s': column '%s': added a NOT NULL constraint",
+                                        self._table, k)
                                 except Exception:
-                                    logger.notifyChannel('orm', netsvc.LOG_WARNING, 'WARNING: unable to set column %s of table %s not null !\nTry to re-run: openerp-server.py --update=module\nIf it doesn\'t work, update records and execute manually:\nALTER TABLE %s ALTER COLUMN %s SET NOT NULL' % (k, self._table, self._table, k))
+                                    msg = "WARNING: unable to set column %s of table %s not null !\n"\
+                                        "Try to re-run: openerp-server.py --update=module\n"\
+                                        "If it doesn't work, update records and execute manually:\n"\
+                                        "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL"
+                                    self.__logger.warn(msg, k, self._table, self._table, k)
                             cr.commit()
-            for order,f,k in todo_update_store:
+            for order, f, k in todo_update_store:
                 todo_end.append((order, self._update_store, (f, k)))
 
         else:
@@ -2689,14 +2730,50 @@ class orm(orm_template):
 
         for (key, con, _) in self._sql_constraints:
             conname = '%s_%s' % (self._table, key)
-            cr.execute("SELECT conname FROM pg_constraint where conname=%s", (conname,))
-            if not cr.dictfetchall():
-                query = 'ALTER TABLE "%s" ADD CONSTRAINT "%s" %s' % (self._table, conname, con,)
+
+            cr.execute("SELECT conname, pg_catalog.pg_get_constraintdef(oid, true) as condef FROM pg_constraint where conname=%s", (conname,))
+            existing_constraints = cr.dictfetchall()
+
+            sql_actions = {
+                'drop': {
+                    'execute': False,
+                    'query': 'ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (self._table, conname, ),
+                    'msg_ok': "Table '%s': dropped constraint '%s'. Reason: its definition changed from '%%s' to '%s'" % (
+                        self._table, conname, con),
+                    'msg_err': "Table '%s': unable to drop \'%s\' constraint !" % (self._table, con),
+                    'order': 1,
+                },
+                'add': {
+                    'execute': False,
+                    'query': 'ALTER TABLE "%s" ADD CONSTRAINT "%s" %s' % (self._table, conname, con,),
+                    'msg_ok': "Table '%s': added constraint '%s' with definition=%s" % (self._table, conname, con),
+                    'msg_err': "Table '%s': unable to add \'%s\' constraint !\n If you want to have it, you should update the records and execute manually:\n%%s" % (
+                        self._table, con),
+                    'order': 2,
+                },
+            }
+
+            if not existing_constraints:
+                # constraint does not exists:
+                sql_actions['add']['execute'] = True
+                sql_actions['add']['msg_err'] = sql_actions['add']['msg_err'] % (sql_actions['add']['query'], )
+            elif con.lower() not in [item['condef'].lower() for item in existing_constraints]:
+                # constraint exists but its definition has changed:
+                sql_actions['drop']['execute'] = True
+                sql_actions['drop']['msg_ok'] = sql_actions['drop']['msg_ok'] % (existing_constraints[0]['condef'].lower(), )
+                sql_actions['add']['execute'] = True
+                sql_actions['add']['msg_err'] = sql_actions['add']['msg_err'] % (sql_actions['add']['query'], )
+
+            # we need to add the constraint:
+            sql_actions = [item for item in sql_actions.values()]
+            sql_actions.sort(key=lambda x: x['order'])
+            for sql_action in [action for action in sql_actions if action['execute']]:
                 try:
-                    cr.execute(query)
+                    cr.execute(sql_action['query'])
                     cr.commit()
+                    self.__schema.debug(sql_action['msg_ok'])
                 except:
-                    logger.notifyChannel('orm', netsvc.LOG_WARNING, 'unable to add \'%s\' constraint on table %s !\n If you want to have it, you should update the records and execute manually:\n%s' % (con, self._table, query))
+                    self.__schema.warn(sql_action['msg_err'])
                     cr.rollback()
 
         if create:
@@ -2728,27 +2805,27 @@ class orm(orm_template):
             if not f.store:
                 continue
             if self._columns[store_field].store is True:
-                sm = {self._name:(lambda self,cr, uid, ids, c={}: ids, None, 10, None)}
+                sm = {self._name: (lambda self, cr, uid, ids, c={}: ids, None, 10, None)}
             else:
                 sm = self._columns[store_field].store
             for object, aa in sm.items():
-                if len(aa)==4:
-                    (fnct,fields2,order,length)=aa
-                elif len(aa)==3:
-                    (fnct,fields2,order)=aa
+                if len(aa) == 4:
+                    (fnct, fields2, order, length) = aa
+                elif len(aa) == 3:
+                    (fnct, fields2, order) = aa
                     length = None
                 else:
                     raise except_orm('Error',
                         ('Invalid function definition %s in object %s !\nYou must use the definition: store={object:(fnct, fields, priority, time length)}.' % (store_field, self._name)))
                 self.pool._store_function.setdefault(object, [])
                 ok = True
-                for x,y,z,e,f,l in self.pool._store_function[object]:
+                for x, y, z, e, f, l in self.pool._store_function[object]:
                     if (x==self._name) and (y==store_field) and (e==fields2):
-                        if f==order:
+                        if f == order:
                             ok = False
                 if ok:
                     self.pool._store_function[object].append( (self._name, store_field, fnct, fields2, order, length))
-                    self.pool._store_function[object].sort(lambda x,y: cmp(x[4],y[4]))
+                    self.pool._store_function[object].sort(lambda x, y: cmp(x[4], y[4]))
 
         for (key, _, msg) in self._sql_constraints:
             self.pool._sql_error[self._table+'_'+key] = msg
@@ -2783,14 +2860,14 @@ class orm(orm_template):
                 elif field['ttype'] == 'many2many':
                     _rel1 = field['relation'].replace('.', '_')
                     _rel2 = field['model'].replace('.', '_')
-                    _rel_name = 'x_%s_%s_%s_rel' %(_rel1, _rel2, field['name'])
+                    _rel_name = 'x_%s_%s_%s_rel' % (_rel1, _rel2, field['name'])
                     self._columns[field['name']] = getattr(fields, field['ttype'])(field['relation'], _rel_name, 'id1', 'id2', **attrs)
                 else:
                     self._columns[field['name']] = getattr(fields, field['ttype'])(**attrs)
         self._inherits_check()
         self._inherits_reload()
         if not self._sequence:
-            self._sequence = self._table+'_id_seq'
+            self._sequence = self._table + '_id_seq'
         for k in self._defaults:
             assert (k in self._columns) or (k in self._inherit_fields), 'Default function defined in %s but field %s does not exist !' % (self._name, k,)
         for f in self._columns:
@@ -2820,7 +2897,7 @@ class orm(orm_template):
         for table, field_name in self._inherits.items():
             if field_name not in self._columns:
                 logging.getLogger('init').info('Missing many2one field definition for _inherits reference "%s" in "%s", using default one.' % (field_name, self._name))
-                self._columns[field_name] =  fields.many2one(table, string="Automatically created field to link to parent %s" % table,
+                self._columns[field_name] = fields.many2one(table, string="Automatically created field to link to parent %s" % table,
                                                              required=True, ondelete="cascade")
             elif not self._columns[field_name].required or self._columns[field_name].ondelete.lower() != "cascade":
                 logging.getLogger('init').warning('Field definition for _inherits reference "%s" in "%s" must be marked as "required" with ondelete="cascade", forcing it.' % (field_name, self._name))
@@ -2895,7 +2972,7 @@ class orm(orm_template):
             select = [ids]
         else:
             select = ids
-        select = map(lambda x: isinstance(x,dict) and x['id'] or x, select)
+        select = map(lambda x: isinstance(x, dict) and x['id'] or x, select)
         result = self._read_flat(cr, user, select, fields, context, load)
 
         for r in result:
@@ -2978,6 +3055,21 @@ class orm(orm_template):
         else:
             res = map(lambda x: {'id': x}, ids)
 
+        if not res:
+            res = map(lambda x: {'id': x}, ids)
+            for record in res:
+                for f in fields_to_read:
+                    field_val = False
+                    if f in self._columns.keys():
+                        ftype = self._columns[f]._type
+                    elif key in self._inherit_fields.keys():
+                        ftype = self._inherit_fields[f][2]._type
+                    else:
+                        continue
+                    if ftype in ('one2many', 'many2many'):
+                        field_val = []
+                    record.update({f:field_val})
+
         for f in fields_pre:
             if f == self.CONCURRENCY_CHECK_FIELD:
                 continue
@@ -3001,7 +3093,7 @@ class orm(orm_template):
                 del r['id']
 
             for record in res:
-                if not record[col]:# if the record is deleted from _inherits table?
+                if not record[col]: # if the record is deleted from _inherits table?
                     continue
                 record.update(res3[record[col]])
                 if col not in fields_to_read:
@@ -3023,12 +3115,12 @@ class orm(orm_template):
         for f in fields_post:
             todo.setdefault(self._columns[f]._multi, [])
             todo[self._columns[f]._multi].append(f)
-        for key,val in todo.items():
+        for key, val in todo.items():
             if key:
                 res2 = self._columns[val[0]].get(cr, self, ids, val, user, context=context, values=res)
                 for pos in val:
                     for record in res:
-                        if isinstance(res2[record['id']], str):res2[record['id']] = eval(res2[record['id']]) #TOCHECK : why got string instend of dict in python2.6
+                        if isinstance(res2[record['id']], str): res2[record['id']] = eval(res2[record['id']]) #TOCHECK : why got string instend of dict in python2.6
                         record[pos] = res2[record['id']][pos]
             else:
                 for f in val:
@@ -3198,8 +3290,8 @@ class orm(orm_template):
                        'where id IN %s', (sub_ids,))
         for order, object, store_ids, fields in result_store:
             if object != self._name:
-                obj =  self.pool.get(object)
-                cr.execute('select id from '+obj._table+' where id IN %s',(tuple(store_ids),))
+                obj = self.pool.get(object)
+                cr.execute('select id from '+obj._table+' where id IN %s', (tuple(store_ids),))
                 rids = map(lambda x: x[0], cr.fetchall())
                 if rids:
                     obj._store_set_values(cr, uid, rids, fields, context)
@@ -3272,7 +3364,7 @@ class orm(orm_template):
                 for group in groups:
                     module = group.split(".")[0]
                     grp = group.split(".")[1]
-                    cr.execute("select count(*) from res_groups_users_rel where gid IN (select res_id from ir_model_data where name=%s and module=%s and model=%s) and uid=%s" \
+                    cr.execute("select count(*) from res_groups_users_rel where gid IN (select res_id from ir_model_data where name=%s and module=%s and model=%s) and uid=%s", \
                                (grp, module, 'res.groups', user))
                     readonly = cr.fetchall()
                     if readonly[0][0] >= 1:
@@ -3369,11 +3461,11 @@ class orm(orm_template):
                 # TODO: optimize
                 for f in direct:
                     if self._columns[f].translate:
-                        src_trans = self.pool.get(self._name).read(cr,user,ids,[f])[0][f]
+                        src_trans = self.pool.get(self._name).read(cr, user, ids, [f])[0][f]
                         if not src_trans:
                             src_trans = vals[f]
                             # Inserting value to DB
-                            self.write(cr, user, ids, {f:vals[f]})
+                            self.write(cr, user, ids, {f: vals[f]})
                         self.pool.get('ir.translation')._set_ids(cr, user, self._name+','+f, 'model', context['lang'], ids, vals[f], src_trans)
 
 
@@ -3412,7 +3504,7 @@ class orm(orm_template):
         # parent_left/right (via a child_of domain)
         if parents_changed:
             if self.pool._init:
-                self.pool._init_parent[self._name]=True
+                self.pool._init_parent[self._name] = True
             else:
                 order = self._parent_order or self._order
                 parent_val = vals[self._parent_name]
@@ -3433,7 +3525,7 @@ class orm(orm_template):
                     for (parent_pright, parent_id) in parents:
                         if parent_id == id:
                             break
-                        position = parent_pright+1
+                        position = parent_pright + 1
 
                     # It's the first node of the parent
                     if not position:
@@ -3441,7 +3533,7 @@ class orm(orm_template):
                             position = 1
                         else:
                             cr.execute('select parent_left from '+self._table+' where id=%s', (parent_val,))
-                            position = cr.fetchone()[0]+1
+                            position = cr.fetchone()[0] + 1
 
                     if pleft < position <= pright:
                         raise except_orm(_('UserError'), _('Recursivity Detected.'))
@@ -3449,18 +3541,18 @@ class orm(orm_template):
                     if pleft < position:
                         cr.execute('update '+self._table+' set parent_left=parent_left+%s where parent_left>=%s', (distance, position))
                         cr.execute('update '+self._table+' set parent_right=parent_right+%s where parent_right>=%s', (distance, position))
-                        cr.execute('update '+self._table+' set parent_left=parent_left+%s, parent_right=parent_right+%s where parent_left>=%s and parent_left<%s', (position-pleft,position-pleft, pleft, pright))
+                        cr.execute('update '+self._table+' set parent_left=parent_left+%s, parent_right=parent_right+%s where parent_left>=%s and parent_left<%s', (position-pleft, position-pleft, pleft, pright))
                     else:
                         cr.execute('update '+self._table+' set parent_left=parent_left+%s where parent_left>=%s', (distance, position))
                         cr.execute('update '+self._table+' set parent_right=parent_right+%s where parent_right>=%s', (distance, position))
-                        cr.execute('update '+self._table+' set parent_left=parent_left-%s, parent_right=parent_right-%s where parent_left>=%s and parent_left<%s', (pleft-position+distance,pleft-position+distance, pleft+distance, pright+distance))
+                        cr.execute('update '+self._table+' set parent_left=parent_left-%s, parent_right=parent_right-%s where parent_left>=%s and parent_left<%s', (pleft-position+distance, pleft-position+distance, pleft+distance, pright+distance))
 
         result += self._store_get_values(cr, user, ids, vals.keys(), context)
         result.sort()
 
         done = {}
         for order, object, ids, fields in result:
-            key = (object,tuple(fields))
+            key = (object, tuple(fields))
             done.setdefault(key, {})
             # avoid to do several times the same computation
             todo = []
@@ -3511,7 +3603,7 @@ class orm(orm_template):
             if self._inherits[v] not in vals:
                 tocreate[v] = {}
             else:
-                tocreate[v] = {'id' : vals[self._inherits[v]]}
+                tocreate[v] = {'id': vals[self._inherits[v]]}
         (upd0, upd1, upd2) = ('', '', [])
         upd_todo = []
         for v in vals.keys():
@@ -3543,7 +3635,7 @@ class orm(orm_template):
             else:
                 self.pool.get(table).write(cr, user, [record_id], tocreate[table], context=context)
 
-            upd0 += ','+self._inherits[table]
+            upd0 += ',' + self._inherits[table]
             upd1 += ',%s'
             upd2.append(record_id)
 
@@ -3617,7 +3709,7 @@ class orm(orm_template):
 
         if self._parent_store and not context.get('defer_parent_store_computation'):
             if self.pool._init:
-                self.pool._init_parent[self._name]=True
+                self.pool._init_parent[self._name] = True
             else:
                 parent = vals.get(self._parent_name, False)
                 if parent:
@@ -3637,7 +3729,7 @@ class orm(orm_template):
                     pleft = cr.fetchone()[0] or 0
                 cr.execute('update '+self._table+' set parent_left=parent_left+2 where parent_left>%s', (pleft,))
                 cr.execute('update '+self._table+' set parent_right=parent_right+2 where parent_right>%s', (pleft,))
-                cr.execute('update '+self._table+' set parent_left=%s,parent_right=%s where id=%s', (pleft+1,pleft+2,id_new))
+                cr.execute('update '+self._table+' set parent_left=%s,parent_right=%s where id=%s', (pleft+1, pleft+2, id_new))
 
         # default element in context must be remove when call a one2many or many2many
         rel_context = context.copy()
@@ -3663,7 +3755,7 @@ class orm(orm_template):
             message = self._description + \
                 " '" + \
                 self.name_get(cr, user, [id_new], context=context)[0][1] + \
-                "' "+ _("created.")
+                "' " + _("created.")
             self.log(cr, user, id_new, message, True, context=context)
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_create(user, self._name, id_new, cr)
@@ -3687,24 +3779,24 @@ class orm(orm_template):
             result.setdefault(fncts[fnct][0], {})
 
             # uid == 1 for accessing objects having rules defined on store fields
-            ids2 = fncts[fnct][2](self,cr, 1, ids, context)
+            ids2 = fncts[fnct][2](self, cr, 1, ids, context)
             for id in filter(None, ids2):
                 result[fncts[fnct][0]].setdefault(id, [])
                 result[fncts[fnct][0]][id].append(fnct)
         dict = {}
         for object in result:
             k2 = {}
-            for id,fnct in result[object].items():
+            for id, fnct in result[object].items():
                 k2.setdefault(tuple(fnct), [])
                 k2[tuple(fnct)].append(id)
-            for fnct,id in k2.items():
-                dict.setdefault(fncts[fnct[0]][4],[])
-                dict[fncts[fnct[0]][4]].append((fncts[fnct[0]][4],object,id,map(lambda x: fncts[x][1], fnct)))
+            for fnct, id in k2.items():
+                dict.setdefault(fncts[fnct[0]][4], [])
+                dict[fncts[fnct[0]][4]].append((fncts[fnct[0]][4], object, id, map(lambda x: fncts[x][1], fnct)))
         result2 = []
         tmp = dict.keys()
         tmp.sort()
         for k in tmp:
-            result2+=dict[k]
+            result2 += dict[k]
         return result2
 
     def _store_set_values(self, cr, uid, ids, fields, context):
@@ -3713,7 +3805,7 @@ class orm(orm_template):
         field_flag = False
         field_dict = {}
         if self._log_access:
-            cr.execute('select id,write_date from '+self._table+' where id IN %s',(tuple(ids),))
+            cr.execute('select id,write_date from '+self._table+' where id IN %s', (tuple(ids),))
             res = cr.fetchall()
             for r in res:
                 if r[1]:
@@ -3740,7 +3832,7 @@ class orm(orm_template):
             if key:
                 # uid == 1 for accessing objects having rules defined on store fields
                 result = self._columns[val[0]].get(cr, self, ids, val, 1, context=context)
-                for id,value in result.items():
+                for id, value in result.items():
                     if field_flag:
                         for f in value.keys():
                             if f in field_dict[id]:
@@ -3760,7 +3852,7 @@ class orm(orm_template):
                     upd1.append(id)
                     if upd0 and upd1:
                         cr.execute('update "' + self._table + '" set ' + \
-                            string.join(upd0, ',') + ' where id = %s', upd1)
+                            ','.join(upd0) + ' where id = %s', upd1)
 
             else:
                 for f in val:
@@ -3771,14 +3863,14 @@ class orm(orm_template):
                             if r in field_dict.keys():
                                 if f in field_dict[r]:
                                     result.pop(r)
-                    for id,value in result.items():
+                    for id, value in result.items():
                         if self._columns[f]._type in ('many2one', 'one2one'):
                             try:
                                 value = value[0]
                             except:
                                 pass
                         cr.execute('update "' + self._table + '" set ' + \
-                            '"'+f+'"='+self._columns[f]._symbol_set[0] + ' where id = %s', (self._columns[f]._symbol_set[1](value),id))
+                            '"'+f+'"='+self._columns[f]._symbol_set[0] + ' where id = %s', (self._columns[f]._symbol_set[1](value), id))
         return True
 
     #
@@ -3847,7 +3939,7 @@ class orm(orm_template):
                               the appropriate JOIN for linking the current model to the one referenced in model_name. 
            :return: True if additional clauses where applied.
         """
-        added_clause, added_params, added_tables  = self.pool.get('ir.rule').domain_get(cr, uid, model_name or self._name, mode, context=context)
+        added_clause, added_params, added_tables = self.pool.get('ir.rule').domain_get(cr, uid, model_name or self._name, mode, context=context)
         if added_clause:
             where_clause += added_clause
             where_clause_params += added_params
@@ -3904,7 +3996,7 @@ class orm(orm_template):
 
         limit_str = limit and ' limit %d' % limit or ''
         offset_str = offset and ' offset %d' % offset or ''
-        
+
         if where:
             where_str = " WHERE %s" % " AND ".join(where)
         else:
@@ -4014,7 +4106,7 @@ class orm(orm_template):
             # we must recursively copy the translations for o2o and o2m
             if field_def['type'] in ('one2one', 'one2many'):
                 target_obj = self.pool.get(field_def['relation'])
-                old_record, new_record  = self.read(cr, uid, [old_id, new_id], [field_name], context=context)
+                old_record, new_record = self.read(cr, uid, [old_id, new_id], [field_name], context=context)
                 # here we rely on the order of the ids to match the translations
                 # as foreseen in copy_data()
                 old_childs = sorted(old_record[field_name])
@@ -4032,9 +4124,9 @@ class orm(orm_template):
                 if trans_name:
                     trans_ids = trans_obj.search(cr, uid, [
                             ('name', '=', trans_name),
-                            ('res_id','=', old_id)
+                            ('res_id', '=', old_id)
                     ])
-                    translation_records.extend(trans_obj.read(cr,uid,trans_ids,context=context))
+                    translation_records.extend(trans_obj.read(cr, uid, trans_ids, context=context))
 
         for record in translation_records:
             del record['id']
@@ -4062,7 +4154,7 @@ class orm(orm_template):
         return new_id
 
     def exists(self, cr, uid, ids, context=None):
-        if type(ids) in (int,long):
+        if type(ids) in (int, long):
             ids = [ids]
         query = 'SELECT count(1) FROM "%s"' % (self._table)
         cr.execute(query + "WHERE ID IN %s", (tuple(ids),))
@@ -4111,10 +4203,10 @@ class orm(orm_template):
         """
         result = dict.fromkeys(ids, '')
         model_data_obj = self.pool.get('ir.model.data')
-        data_ids = model_data_obj.search(cr,uid,
-                [('model','=',self._name),('res_id','in',ids)])
-        data_results = model_data_obj.read(cr,uid,data_ids,
-                ['name','module','res_id'])
+        data_ids = model_data_obj.search(cr, uid,
+                [('model', '=', self._name), ('res_id', 'in', ids)])
+        data_results = model_data_obj.read(cr, uid, data_ids,
+                ['name', 'module', 'res_id'])
         for record in data_results:
             result[record['res_id']] = '%(module)s.%(name)s' % record
         return result
diff --git a/bin/pooler.py b/bin/pooler.py
index d0f38836504..7a572e71e0d 100644
--- a/bin/pooler.py
+++ b/bin/pooler.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -34,10 +34,10 @@ def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False,
         import osv.osv
         pool = osv.osv.osv_pool()
         pool_dic[db_name] = pool
-        
+
         try:
             addons.load_modules(db, force_demo, status, update_module)
-        except Exception, e:
+        except Exception:
             del pool_dic[db_name]
             raise
 
@@ -51,13 +51,12 @@ def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False,
         import report
         report.interface.register_all(db)
         if pooljobs:
-            pool.get('ir.cron')._poolJobs(db.dbname)
+            pool.get('ir.cron').restart(db.dbname)
     return db, pool
 
 
 def restart_pool(db_name, force_demo=False, status=None, update_module=False):
     if db_name in pool_dic:
-        pool_dic[db_name].get('ir.cron').cancel(db_name)
         del pool_dic[db_name]
     return get_db_and_pool(db_name, force_demo, status, update_module=update_module)
 
diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index 2ee22ebcaf9..227e3084bbf 100644
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -54,17 +54,11 @@ class report_printscreen_list(report_int):
         if not context:
             context={}
         datas['ids'] = ids
-        pool = pooler.get_pool(cr.dbname)
-        model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
-        if model_id:
-            model_desc = pool.get('ir.model').browse(cr, uid, model_id, context).name
-            self.title = model_desc
-        else:
-            model_desc = model._description
-            self.title = model_desc
-
         model = pool.get(datas['model'])
-        result = model.fields_view_get(cr, uid, view_type='tree', context=context)
+        pool = pooler.get_pool(cr.dbname)
+        # title come from description of model which are specified in py file.
+        self.title = model._description
+        result = model.fields_view_get(cr, uid, view_type='form', context=context)
 
         fields_order = self._parse_string(result['arch'])
         rows = model.read(cr, uid, datas['ids'], result['fields'].keys() )
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index de54ef83c57..a350f52aa8c 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -65,13 +65,9 @@ class report_printscreen_list(report_int):
         self.groupby_no_leaf = context.get('group_by_no_leaf',False)
         pool = pooler.get_pool(cr.dbname)
         model = pool.get(datas['model'])
-        model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
-        if model_id:
-            model_desc = pool.get('ir.model').browse(cr, uid, model_id[0], context).name
-            self.title = model_desc
-        else:
-            model_desc = model._description
-            self.title = model_desc
+        # Title come from description of model which are specified in py file.
+        model_desc = model._description
+        self.title = model_desc
         datas['ids'] = ids
         model = pooler.get_pool(cr.dbname).get(datas['model'])
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 6e7c6b95696..aeb04ed21b6 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -110,7 +110,7 @@ class _date_format(str, _format):
         if self.val:
             if getattr(self,'name', None):
                 date = datetime.strptime(self.name, DT_FORMAT)
-                return date.strftime(str(self.lang_obj.date_format)) 
+                return date.strftime(str(self.lang_obj.date_format))
         return self.val
 
 class _dttime_format(str, _format):
@@ -253,20 +253,11 @@ class rml_parse(object):
             date_format = self.lang_dict['date_format']
             parse_format = DT_FORMAT
             if date_time:
+                value=value.split('.')[0]
                 date_format = date_format + " " + self.lang_dict['time_format']
                 parse_format = DHM_FORMAT
-
-            # filtering time.strftime('%Y-%m-%d')
-#            if type(value) == type(''):
-#                parse_format = DHM_FORMAT
-#                if (not date_time):
-#                    return str(value)
-
             if not isinstance(value, time.struct_time):
-                try:
-                    date = datetime.datetime(str(value), parse_format)
-                except:# sometimes it takes converted values into value, so we dont need conversion.
-                    return str(value)
+                return time.strftime(date_format, time.strptime(value, parse_format))
             else:
                 date = datetime(*value.timetuple()[:6])
             return date.strftime(date_format)
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 8f1fc910739..8b33b41a0b3 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import base64
-import logging
 import os
 import security
 import thread
@@ -39,8 +38,6 @@ import tools
 import locale
 from cStringIO import StringIO
 
-logging.basicConfig()
-
 class db(netsvc.ExportService):
     def __init__(self, name="db"):
         netsvc.ExportService.__init__(self, name)
diff --git a/bin/sql_db.py b/bin/sql_db.py
index 5ed7b14c0df..193a709dd8d 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 __all__ = ['db_connect', 'close_db']
 
+from threading import currentThread
 import logging
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
 from psycopg2.psycopg1 import cursor as psycopg1cursor
@@ -107,7 +108,7 @@ class Cursor(object):
             self._close(True)
 
     @check
-    def execute(self, query, params=None):
+    def execute(self, query, params=None, log_exceptions=True):
         if '%d' in query or '%f' in query:
             self.__logger.warn(query)
             self.__logger.warn("SQL queries cannot contain %d or %f anymore. "
@@ -122,10 +123,12 @@ class Cursor(object):
             params = params or None
             res = self._obj.execute(query, params)
         except psycopg2.ProgrammingError, pe:
-            self.__logger.error("Programming error: %s, in query %s", pe, query)
+            if log_exceptions or self.sql_log:
+                self.__logger.error("Programming error: %s, in query %s", pe, query)
             raise
         except Exception:
-            self.__logger.exception("bad query: %s", self._obj.query)
+            if log_exceptions or self.sql_log:
+                self.__logger.exception("bad query: %s", self._obj.query or query)
             raise
 
         if self.sql_log:
@@ -267,7 +270,7 @@ class ConnectionPool(object):
                 delattr(cnx, 'leaked')
                 self._connections.pop(i)
                 self._connections.append((cnx, False))
-                self._debug('Free leaked connection to %r', cnx.dsn)
+                self.__logger.warn('%r: Free leaked connection to %r', self, cnx.dsn)
 
         for i, (cnx, used) in enumerate(self._connections):
             if not used and dsn_are_equals(cnx.dsn, dsn):
@@ -310,7 +313,7 @@ class ConnectionPool(object):
 
     @locked
     def close_all(self, dsn):
-        self._debug('Close all connections to %r', dsn)
+        self.__logger.info('%r: Close all connections to %r', self, dsn)
         for i, (cnx, used) in tools.reverse_enumerate(self._connections):
             if dsn_are_equals(cnx.dsn, dsn):
                 cnx.close()
@@ -362,11 +365,15 @@ def dsn_are_equals(first, second):
 _Pool = ConnectionPool(int(tools.config['db_maxconn']))
 
 def db_connect(db_name):
+    currentThread().dbname = db_name
     return Connection(_Pool, db_name)
 
 def close_db(db_name):
     _Pool.close_all(dsn(db_name))
     tools.cache.clean_caches_for_db(db_name)
+    ct = currentThread()
+    if hasattr(ct, 'dbname'):
+        delattr(ct, 'dbname')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/tools/__init__.py b/bin/tools/__init__.py
index 9b7bb84a57f..f1a0faf0f8f 100644
--- a/bin/tools/__init__.py
+++ b/bin/tools/__init__.py
@@ -29,6 +29,7 @@ from graph import graph
 from amount_to_text import *
 from amount_to_text_en import *
 from pdf_utils import *
+from yaml_import import *
 from sql import *
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 4220e259e32..b90df1441d9 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -68,7 +68,7 @@ class configmanager(object):
             'import_partial': "",
             'pidfile': None,
             'logfile': None,
-            'logrotate': '1',
+            'logrotate': True,
             'smtp_server': 'localhost',
             'smtp_user': False,
             'smtp_port':25,
@@ -88,6 +88,8 @@ class configmanager(object):
             'static_http_enable': False,
             'static_http_document_root': None,
             'static_http_url_prefix': None,
+            'secure_cert_file': 'server.cert',
+            'secure_pkey_file': 'server.pkey',
         }
 
         self.misc = {}
@@ -119,8 +121,8 @@ class configmanager(object):
         group.add_option("--xmlrpcs-interface", dest="xmlrpcs_interface", help="specify the TCP IP address for the XML-RPC Secure protocol")
         group.add_option("--xmlrpcs-port", dest="xmlrpcs_port", help="specify the TCP port for the XML-RPC Secure protocol", type="int")
         group.add_option("--no-xmlrpcs", dest="xmlrpcs", action="store_false", help="disable the XML-RPC Secure protocol")
-        group.add_option("--cert-file", dest="secure_cert_file", default="server.cert", help="specify the certificate file for the SSL connection")
-        group.add_option("--pkey-file", dest="secure_pkey_file", default="server.pkey", help="specify the private key file for the SSL connection")
+        group.add_option("--cert-file", dest="secure_cert_file", help="specify the certificate file for the SSL connection")
+        group.add_option("--pkey-file", dest="secure_pkey_file", help="specify the private key file for the SSL connection")
         parser.add_option_group(group)
 
         # NET-RPC
@@ -129,21 +131,21 @@ class configmanager(object):
         group.add_option("--netrpc-port", dest="netrpc_port", help="specify the TCP port for the NETRPC protocol", type="int")
         group.add_option("--no-netrpc", dest="netrpc", action="store_false", help="disable the NETRPC protocol")
         parser.add_option_group(group)
-        
+
         # Static HTTP
         group = optparse.OptionGroup(parser, "Static HTTP service")
         group.add_option("--static-http-enable", dest="static_http_enable", action="store_true", default=False, help="enable static HTTP service for serving plain HTML files")
         group.add_option("--static-http-document-root", dest="static_http_document_root", help="specify the directory containing your static HTML files (e.g '/var/www/')")
         group.add_option("--static-http-url-prefix", dest="static_http_url_prefix", help="specify the URL root prefix where you want web browsers to access your static HTML files (e.g '/')")
         parser.add_option_group(group)
-        
+
         parser.add_option("-i", "--init", dest="init", help="init a module (use \"all\" for all modules)")
         parser.add_option("--without-demo", dest="without_demo",
                           help="load demo data for a module (use \"all\" for all modules)", default=False)
         parser.add_option("-u", "--update", dest="update",
                           help="update a module (use \"all\" for all modules)")
         parser.add_option("--cache-timeout", dest="cache_timeout",
-                          help="set the timeout for the cache system", default=100000, type="int")
+                          help="set the timeout for the cache system", type="int")
         parser.add_option("-t", "--timezone", dest="timezone", help="specify reference timezone for the server (e.g. Europe/Brussels")
 
         # stops the server from launching after initialization
@@ -166,7 +168,7 @@ class configmanager(object):
         group = optparse.OptionGroup(parser, "Logging Configuration")
         group.add_option("--logfile", dest="logfile", help="file where the server log will be stored")
         group.add_option("--no-logrotate", dest="logrotate", action="store_false",
-                         default=None, help="do not rotate the logfile")
+                         help="do not rotate the logfile")
         group.add_option("--syslog", action="store_true", dest="syslog",
                          default=False, help="Send the log to the syslog server")
         group.add_option('--log-level', dest='log_level', type='choice', choices=self._LOGLEVELS.keys(),
@@ -175,12 +177,12 @@ class configmanager(object):
 
         # SMTP Group
         group = optparse.OptionGroup(parser, "SMTP Configuration")
-        group.add_option('--email-from', dest='email_from', default='', help='specify the SMTP email address for sending email')
-        group.add_option('--smtp', dest='smtp_server', default='', help='specify the SMTP server for sending email')
-        group.add_option('--smtp-port', dest='smtp_port', default='25', help='specify the SMTP port', type="int")
-        group.add_option('--smtp-ssl', dest='smtp_ssl', default='', help='specify the SMTP server support SSL or not')
-        group.add_option('--smtp-user', dest='smtp_user', default='', help='specify the SMTP username for sending email')
-        group.add_option('--smtp-password', dest='smtp_password', default='', help='specify the SMTP password for sending email')
+        group.add_option('--email-from', dest='email_from', help='specify the SMTP email address for sending email')
+        group.add_option('--smtp', dest='smtp_server', help='specify the SMTP server for sending email')
+        group.add_option('--smtp-port', dest='smtp_port', help='specify the SMTP port', type="int")
+        group.add_option('--smtp-ssl', dest='smtp_ssl', action='store_true', help='specify the SMTP server support SSL or not')
+        group.add_option('--smtp-user', dest='smtp_user', help='specify the SMTP username for sending email')
+        group.add_option('--smtp-password', dest='smtp_password', help='specify the SMTP password for sending email')
         parser.add_option_group(group)
 
         group = optparse.OptionGroup(parser, "Database related options")
@@ -190,7 +192,7 @@ class configmanager(object):
         group.add_option("--pg_path", dest="pg_path", help="specify the pg executable path")
         group.add_option("--db_host", dest="db_host", help="specify the database host")
         group.add_option("--db_port", dest="db_port", help="specify the database port", type="int")
-        group.add_option("--db_maxconn", dest="db_maxconn", default='64',
+        group.add_option("--db_maxconn", dest="db_maxconn", type='int',
                          help="specify the the maximum number of physical connections to posgresql")
         group.add_option("-P", "--import-partial", dest="import_partial",
                          help="Use this for big data importation, if it crashes you will be able to continue at the current state. Provide a filename to store intermediate importation states.", default=False)
@@ -216,7 +218,7 @@ class configmanager(object):
         parser.add_option_group(group)
 
         security = optparse.OptionGroup(parser, 'Security-related options')
-        security.add_option('--no-database-list', action="store_false", dest='list_db', default=True, help="disable the ability to return the list of databases")
+        security.add_option('--no-database-list', action="store_false", dest='list_db', help="disable the ability to return the list of databases")
         security.add_option('--enable-code-actions', action='store_true',
                             dest='server_actions_allow_code', default=False,
                             help='Enables server actions of state "code". Warning, this is a security risk.')
@@ -267,8 +269,8 @@ class configmanager(object):
             self.options['pidfile'] = False
 
         keys = ['xmlrpc_interface', 'xmlrpc_port', 'db_name', 'db_user', 'db_password', 'db_host',
-                'db_port', 'list_db', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout','smtp_ssl',
-                'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 
+                'db_port', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout',
+                'email_from', 'smtp_server', 'smtp_user', 'smtp_password',
                 'netrpc_interface', 'netrpc_port', 'db_maxconn', 'import_partial', 'addons_path',
                 'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',
                 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
@@ -280,9 +282,9 @@ class configmanager(object):
             if getattr(opt, arg):
                 self.options[arg] = getattr(opt, arg)
 
-        keys = ['language', 'translate_out', 'translate_in', 'debug_mode',
+        keys = ['language', 'translate_out', 'translate_in', 'debug_mode', 'smtp_ssl',
                 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
-                'list_db', 'server_actions_allow_code', 'xmlrpcs', 
+                'list_db', 'server_actions_allow_code', 'xmlrpcs',
                 'test_file', 'test_disable', 'test_commit'
                 ]
 
diff --git a/bin/tools/safe_eval.py b/bin/tools/safe_eval.py
index c69577b85f5..fa6e04bf92c 100644
--- a/bin/tools/safe_eval.py
+++ b/bin/tools/safe_eval.py
@@ -262,6 +262,9 @@ def safe_eval(expr, globals_dict=None, locals_dict=None, mode="eval", nocopy=Fal
                 'map': map,
                 'abs': abs,
                 'reduce': reduce,
+                'filter': filter,
+                'round': round,
+                'len': len
             }
     )
     return eval(test_expr(expr,_SAFE_OPCODES, mode=mode), globals_dict, locals_dict)