diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e59761c3414..c0bd50eb7bc 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -122,16 +122,16 @@
                     <field name="name" select="1" colspan="4"/>
                     <field name="code" select="1"/>
                     <field name="parent_id"/>
-                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <newline/>
-                            <field name="currency_id" select="2"/>
-                            <field name="currency_mode" select="2"/>
+                            <field name="currency_id"/>
+                            <field name="currency_mode"/>
                             <field name="reconcile"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="check_history"/>
                             <field name="type" select="1"/>
                             <newline/>
@@ -338,7 +338,7 @@
                     <field name="date" select="1"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
                     <field name="currency"/>
-                    <field name="period_id" select="2"/>
+                    <field name="period_id"/>
                     <group colspan="2" col="3">
 <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
 <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
@@ -382,7 +382,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="gtk-apply"/>
@@ -599,14 +599,14 @@
                         <field name="name" select="1"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="description" select="1"/>
-                        <field name="active" select="2"/>
+                        <field name="active"/>
                         <field name="tax_group" select="1"/>
                         <field name="type"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Tax Definition">
                             <field name="applicable_type"/>
-                            <field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
+                            <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
                             <field groups="base.group_extended" name="domain"/>
                             <newline/>
@@ -701,23 +701,23 @@
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
                             <field name="date" select="1"/>
-                            <field name="ref" select="2"/>
-                            <field name="invoice" select="2"/>
+                            <field name="ref"/>
+                            <field name="invoice"/>
                             <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
 
-                            <field name="debit" select="2"/>
-                            <field name="credit" select="2"/>
+                            <field name="debit"/>
+                            <field name="credit"/>
                             <field name="company_id" required="1" groups="base.group_multi_company"/>
 
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
-                            <field name="quantity" select="2"/>
+                            <field name="quantity"/>
                             <field name="move_id" required="False"/>
                             <newline/>
-                            <field name="statement_id" select="2"/>
-                            <field name="blocked" select="2"/>
+                            <field name="statement_id"/>
+                            <field name="blocked"/>
                             <field name="date_maturity"/>
                             <field name="date_created"/>
                             <newline/>
@@ -728,11 +728,11 @@
                             <field name="analytic_account_id"/>
 
                             <separator colspan="4" string="State"/>
-                            <field name="journal_id" select="2"/>
+                            <field name="journal_id"/>
                             <field name="period_id"/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                         </page>
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -754,14 +754,14 @@
                         <page string="Information">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <field name="journal_id" readonly="False" select="1"/>
-                            <field name="period_id" readonly="False" select="2"/>
+                            <field name="period_id" readonly="False"/>
                             <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="partner_id" select="2" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                             <newline/>
-                            <field name="debit" select="2"/>
-                            <field name="credit" select="2"/>
+                            <field name="debit"/>
+                            <field name="credit"/>
 
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
@@ -780,7 +780,7 @@
                             <newline/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                         </page>
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1"/>
@@ -861,13 +861,13 @@
                 <form string="Account Entry">
                     <group colspan="4" col="6">
                     <field name="name" select="1" readonly="True"/>
-                    <field name="period_id" select="2"/>
+                    <field name="period_id"/>
                     <field name="journal_id" select="1"/>
                     <field name="company_id" required="1" groups="base.group_multi_company"/>
                     <field name="date" select="1"/>
                     <field name="ref" select="1"/>
-                    <field name="to_check" select="2"/>
-                    <field name="type" select="2" groups="base.group_extended"/>
+                    <field name="to_check"/>
+                    <field name="type" groups="base.group_extended"/>
                     </group>
                     <field name="partner_id" invisible="1" select="1"/>
                     <field name="amount" invisible="1" select="1"/>
@@ -917,7 +917,7 @@
                         </tree>
                     </field>
                     <separator colspan="4" string="Narration"/>
-                    <field name="narration" select="2" colspan="4" nolabel="1"/>
+                    <field name="narration" colspan="4" nolabel="1"/>
                     <separator colspan="4" string="State"/>
                     <field name="state" select="1"/>
                     <group col="2" colspan="2">
@@ -1041,7 +1041,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
@@ -1315,7 +1315,7 @@
 
                     <separator colspan="4" string="Subscription Periods"/>
                     <field name="date_start" select="1"/>
-                    <field name="period_total" select="2"/>
+                    <field name="period_total"/>
 
                     <field name="period_nbr"/>
                     <field name="period_type"/>
@@ -1328,7 +1328,7 @@
                     <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
 
                     <separator colspan="4" string="State"/>
-                    <field name="state" select="2"/>
+                    <field name="state"/>
                     <group col="1" colspan="2">
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                     </group>
@@ -1485,6 +1485,7 @@
         <!-- register configuration wizard -->
         <record id="config_fiscalyear" model="ir.actions.todo">
             <field name="action_id" ref="action_account_config_wizard_form"/>
+            <field name="restart">onskip</field>
         </record>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
@@ -1534,7 +1535,7 @@
                             <field name="type" select="1"/>
                             <field name="user_type" select="1"/>
 
-                            <field name="currency_id" select="2"/>
+                            <field name="currency_id"/>
                             <field name="reconcile"/>
                             <field name="tax_ids" colspan="4"/>
                         </page>
@@ -1627,13 +1628,13 @@
                         <newline/>
                         <field name="chart_template_id" select="1"/>
                         <field name="tax_group" select="1"/>
-                        <field name="type" select="2"/>
-                        <field name="type_tax_use" select="2"/>
+                        <field name="type"/>
+                        <field name="type_tax_use"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Tax Definition">
                             <field name="applicable_type"/>
-                            <field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
+                            <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
                             <field groups="base.group_extended" name="domain"/>
                             <newline/>
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 4ce6d517320..11d92443f73 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-17 23:18+0000\n"
-"Last-Translator: Sianna <Unknown>\n"
+"PO-Revision-Date: 2010-04-17 18:26+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-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -55,7 +55,7 @@ msgstr "Актив"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -257,7 +257,7 @@ msgstr "Данъци за доставчици"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Общ дебит"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -370,7 +370,7 @@ msgstr "Аналитична сметка"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Данък върху подчинени"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -387,7 +387,7 @@ msgstr "Описание на фактура"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -398,7 +398,7 @@ msgstr "Общо записи"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Счетоводен източник"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -537,7 +537,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr ""
+msgstr "Шаблони на данъци"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -552,13 +552,13 @@ msgstr "Отложен метод"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Включване в основната сума"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Базов код на обезщетение"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -591,7 +591,7 @@ msgstr "account.tax"
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Дата на отпечатване"
 
 #. module: account
 #: rml:account.general.ledger:0
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 80379fedc09..6ff1b7a22e7 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:45+0000\n"
+"PO-Revision-Date: 2010-04-18 09:39+0000\n"
 "Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
 "tic.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -41,7 +41,7 @@ msgstr "Codificació assentaments"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Especifiquel el missage per als pagaments fora de termini."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -326,7 +326,7 @@ msgstr "Origen"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Nom de l'assentament"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -436,7 +436,7 @@ msgstr "Negatiu"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Compte/Empresa) Nom"
 
 #. module: account
 #: selection:account.move,type:0
@@ -482,7 +482,7 @@ msgstr "Conciliació bancària"
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -1160,7 +1160,7 @@ msgstr "Preu un."
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Període des de:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1353,7 +1353,7 @@ msgstr "Homòleg centralitzat"
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1516,7 +1516,7 @@ msgstr "Tanca estats"
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "wizard.company.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -1854,7 +1854,7 @@ msgstr "Compte director"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "a:"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -2186,7 +2186,7 @@ msgstr "Assentament analític"
 #. module: account
 #: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Missatge de pagaments fora de termini"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2488,7 +2488,7 @@ msgstr "Obre diari"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2681,7 +2681,7 @@ msgstr "Patrimoni"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Missage dels pagaments fora de termini"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2743,7 +2743,7 @@ msgstr "-"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -3898,7 +3898,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Missatge de l'informe dels pagaments fora de termini"
 
 #. module: account
 #: selection:account.tax,tax_group:0
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index f6d352c5e1d..b1186085eb9 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 8af1b79c7cf..494c0f71a48 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -84,23 +84,23 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Customer Credit" colspan="2"/>
-                        <field name="credit" select="2"/>
-                        <field name="credit_limit" select="2" groups="base.group_extended"/>
+                        <field name="credit"/>
+                        <field name="credit_limit" groups="base.group_extended"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Supplier Debit" colspan="2"/>
-                        <field name="debit" select="2"/>
+                        <field name="debit"/>
                     </group>
-                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1" select="2">
+                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1">
                         <form string="Bank account">
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                             <newline/>
                             <field name="acc_number" select="1"/>
                             <newline/>
                             <field name="bank"/>
                             <newline/>
                             <field name="sequence"/>
-                            <field colspan="4" name="name" select="2"/>
+                            <field colspan="4" name="name"/>
                             <separator colspan="4" string="Bank account owner"/>
                             <field colspan="4" name="owner_name"/>
                             <field colspan="4" name="street"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index f9ea49e3b03..b83ce33596d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -2,7 +2,7 @@
     <data>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
-        <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
+        <menuitem id="menu_invoicing" name="Billing" parent="next_id_71" sequence="20"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
             <field name="name">All Uninvoiced Entries</field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 0e9bc494a56..64c71c1a2e2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -39,11 +39,11 @@
 
                         <field name="last_invoice_date"/>
 
-                        <field name="last_worked_invoiced_date" select="2"/>
+                        <field name="last_worked_invoiced_date"/>
                         <field name="last_worked_date"/>
                         <separator colspan="4" string="To be invoiced"/>
                         <field name="hours_qtt_non_invoiced"/>
-                        <field name="ca_to_invoice" select="2"/>
+                        <field name="ca_to_invoice"/>
 
                     </page>
                     <page string="Stats by month">
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index 2a22a84bee6..4695d7c6f35 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index b34db9df7be..e5e324757a8 100644
--- a/addons/account_anglo_saxon/i18n/es.po
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-03-24 17:25+0000\n"
-"Last-Translator: relojero <relojero28@gmail.com>\n"
+"PO-Revision-Date: 2010-04-17 21:08+0000\n"
+"Last-Translator: Rodrigo Machado Laprebendere <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
@@ -38,16 +38,29 @@ msgid ""
 "    when the invoice is created to transfer this amount to the debtor or "
 "creditor account."
 msgstr ""
+"Éste módulo soportará la metodología de contabilización Anglosajona \n"
+"    cambiando la lógica de contabilización con transacciones de acciones. La "
+"diferencia entre los países de contabilización Anglosajona \n"
+"    y el Rin o también llamados países de contabilización Continental es el "
+"momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
+"    La contabilización Anglosajona toma el costo cuando la factura de ventas "
+"es creada, la contabilización Continental tomará el costo en el momento en "
+"que los bienes son enviados.\n"
+"    Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
+"para almacenar el valor de los bienes enviados y devolverá esta cuenta "
+"provisional \n"
+"    cuando la factura sea creada para transferir esta cantidad al deudor o "
+"acreedor de la cuenta."
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Account"
-msgstr ""
+msgstr "Cuenta de Valores"
 
 #. module: account_anglo_saxon
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "¡XML Inválido para la Arquitectura de la Vista!"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_balance/i18n/oc.po b/addons/account_balance/i18n/oc.po
index b1a85b1ca9a..353d32d50de 100644
--- a/addons/account_balance/i18n/oc.po
+++ b/addons/account_balance/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index ed5be32a2c1..56008013075 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -296,7 +296,7 @@
 
         <!--Menu for project management-->
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-        <menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
+        <menuitem id="base.menu_pm_invoicing" name="Billing" parent="base.menu_main_pm" sequence="7"/>
         <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
         <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
         <menuitem parent="menu_pm_budget"
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
new file mode 100644
index 00000000000..ec23a0f5a84
--- /dev/null
+++ b/addons/account_followup/i18n/oc.po
@@ -0,0 +1,496 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-17 09:13+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Data :"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
+msgid "All payable entries"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Amount In Currency"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Due"
+msgstr "Tèrme"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Debit total"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(user_signature)s: User name"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Select partners"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,followup_line:0
+msgid "Follow-Up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Email Settings"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
+msgstr "Tipe de compte"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Ref"
+msgstr "Ref."
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(date)s: Current Date"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,init,date:0
+msgid "Follow-up Sending Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: rml:account_followup.followup.print:0
+msgid "Description"
+msgstr "Descripcion"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Balança :"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup,company_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,email_subject:0
+msgid "Email Subject"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Pagat"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(line)s: Account Move lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_followup:0
+msgid "Latest followup"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Ups Criteria"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Partner Selection"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,init:0
+msgid "Follow-up and Date Selection"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Select partners to remind"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Li."
+msgstr "Lit."
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,summary,end:0
+msgid "Ok"
+msgstr "D'acòrdi"
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+msgid "First move"
+msgstr ""
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "End of Month"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(company_name)s: User's Company name"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
+msgid "All receivable entries"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Lines"
+msgstr "Linhas"
+
+#. module: account_followup
+#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
+#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
+msgid "Send followups"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_line_id:0
+msgid "Follow-up Level"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup statistics"
+msgstr ""
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,init,next:0
+msgid "Continue"
+msgstr "Contunhar"
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,summary:0
+#: wizard_field:account_followup.followup.print.all,summary,summary:0
+msgid "Summary"
+msgstr "Resumit"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "Follow-Up Lines"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,balance:0
+msgid "Balance"
+msgstr "Balança"
+
+#. module: account_followup
+#: help:account_followup.followup.print.all,init,date:0
+msgid ""
+"This field allow you to select a forecast date to plan your follow-ups"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Credit total"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr ""
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.model,name:account_followup.model_account_followup_followup
+#: model:ir.ui.menu,name:account_followup.account_followup_menu
+#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
+msgid "Follow-Ups"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+#: wizard_field:account_followup.followup.print.all,next,email_body:0
+msgid "Email body"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+msgid "Last move"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr ""
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Legend"
+msgstr "Legenda"
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(heading)s: Move line header"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(partner_name)s: Partner name"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,email_conf:0
+msgid "Send email confirmation"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,init,followup_id:0
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,name:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,init,end:0
+#: wizard_button:account_followup.followup.print.all,next,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_followup
+#: field:account_followup.followup.line,delay:0
+msgid "Days of delay"
+msgstr ""
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,next,print:0
+msgid "Print Follow Ups & Send Mails"
+msgstr ""
diff --git a/addons/account_invoice_layout/i18n/oc.po b/addons/account_invoice_layout/i18n/oc.po
new file mode 100644
index 00000000000..75538d6bf99
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/oc.po
@@ -0,0 +1,313 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-17 09:32+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Invoice Date:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "Títol"
+
+#. module: account_invoice_layout
+#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
+msgid "Invoices with Layout and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "(Incl. taxes):"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "Nòta"
+
+#. module: account_invoice_layout
+#: wizard_button:wizard.notify_message,init,print:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Customer Ref:"
+msgstr "Referéncia Client :"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid ")"
+msgstr ")"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Tipe"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Price"
+msgstr "Prètz"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "/ ("
+msgstr "/ ("
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "Compte d'origina"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Base"
+msgstr "Basa"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Document:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: wizard_view:wizard.notify_message,init:0
+msgid "Select Message"
+msgstr "Seleccionatz lo Messatge"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "Messatges"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Produch"
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Description/Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Note :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Tax"
+msgstr "Impòstes e taxas"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "account_invoice_layout"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Total (Excl. taxes):"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_invoice_layout
+#: wizard_button:wizard.notify_message,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: wizard_field:wizard.notify_message,init,message:0
+msgid "Message"
+msgstr "Messatge"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Total"
+msgstr "Total"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
index 2ea3d31ed0a..6c3c83511cc 100644
--- a/addons/account_tax_include/i18n/cs.po
+++ b/addons/account_tax_include/i18n/cs.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-17 18:14+0000\n"
+"Last-Translator: Valerie Engel <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neplatný XML pro zobrazení architektury"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index d5b8092cc82..53ff398e82e 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index 5ee29c67540..fffd713522f 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/association/__terp__.py b/addons/association/__openerp__.py
similarity index 100%
rename from addons/association/__terp__.py
rename to addons/association/__openerp__.py
diff --git a/addons/auction/__terp__.py b/addons/auction/__openerp__.py
similarity index 100%
rename from addons/auction/__terp__.py
rename to addons/auction/__openerp__.py
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__openerp__.py
similarity index 100%
rename from addons/audittrail/__terp__.py
rename to addons/audittrail/__openerp__.py
diff --git a/addons/base_action_rule/__terp__.py b/addons/base_action_rule/__openerp__.py
similarity index 100%
rename from addons/base_action_rule/__terp__.py
rename to addons/base_action_rule/__openerp__.py
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__openerp__.py
similarity index 100%
rename from addons/base_calendar/__terp__.py
rename to addons/base_calendar/__openerp__.py
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 6a29b023301..30bc83e0616 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -91,7 +91,7 @@ def real_id2base_calendar_id(real_id, recurrent_date):
 
     if real_id and recurrent_date:
         recurrent_date = time.strftime("%Y%m%d%H%M%S", \
-                         time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
+                            time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
         return '%d-%s' % (real_id, recurrent_date)
     return real_id
 
@@ -253,7 +253,7 @@ class calendar_attendee(osv.osv):
                     result[id][name] = ''
                     continue
                 else:
-                    result[id][name] =  self._get_address(attdata.sent_by_uid.name, \
+                    result[id][name] = self._get_address(attdata.sent_by_uid.name, \
                                         attdata.sent_by_uid.address_id.email)
             if name == 'cn':
                 if attdata.user_id:
@@ -327,59 +327,60 @@ class calendar_attendee(osv.osv):
         'cutype': fields.selection([('individual', 'Individual'), \
                     ('group', 'Group'), ('resource', 'Resource'), \
                     ('room', 'Room'), ('unknown', '') ], \
-                    'Invite Type', help="Specify the type of Invitation"),
-        'member': fields.char('Member', size=124,
-                    help="Indicate the groups that the attendee belongs to"),
+                    'Invite Type', help="Specify the type of Invitation"), 
+        'member': fields.char('Member', size=124, 
+                    help="Indicate the groups that the attendee belongs to"), 
         'role': fields.selection([('req-participant', 'Participation required'), \
                     ('chair', 'Chair Person'), \
                     ('opt-participant', 'Optional Participation'), \
                     ('non-participant', 'For information Purpose')], 'Role', \
-                    help='Participation role for the calendar user'),
-        'state': fields.selection([('tentative', 'Tentative'),
-                        ('needs-action', 'Needs Action'),
-                        ('accepted', 'Accepted'),
-                        ('declined', 'Declined'),
-                        ('delegated', 'Delegated')], 'State', readonly=True,\
-                        help="Status of the attendee's participation"),
-        'rsvp':  fields.boolean('Required Reply?',
-                    help="Indicats whether the favor of a reply is requested"),
+                    help='Participation role for the calendar user'), 
+        'state': fields.selection([('tentative', 'Tentative'), 
+                        ('needs-action', 'Needs Action'), 
+                        ('accepted', 'Accepted'), 
+                        ('declined', 'Declined'), 
+                        ('delegated', 'Delegated')], 'State', readonly=True, \
+                        help="Status of the attendee's participation"), 
+        'rsvp':  fields.boolean('Required Reply?', 
+                    help="Indicats whether the favor of a reply is requested"), 
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"),
+request was delegated to"), 
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel',\
-                                       'attendee_id', 'parent_id', 'Delegrated From'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel',\
-                                      'attendee_id', 'child_id', 'Delegrated To'),
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By',\
-                         type="char", multi='sent_by', store=True, size=124,\
-                         help="Specify the user that is acting on behalf of the calendar user"),
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User',\
-                             type="many2one", relation="res.users", multi='sent_by_uid'),
-        'cn': fields.function(_compute_data, method=True, string='Common name',\
-                             type="char", size=124, multi='cn', store=True),
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', \
+                                    'attendee_id', 'parent_id', 'Delegrated From'), 
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', \
+                                      'attendee_id', 'child_id', 'Delegrated To'), 
+        'sent_by': fields.function(_compute_data, method=True, string='Sent By', \
+                        type="char", multi='sent_by', store=True, size=124, \
+                        help="Specify the user that is acting on behalf of the calendar user"), 
+        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', \
+                            type="many2one", relation="res.users", multi='sent_by_uid'), 
+        'cn': fields.function(_compute_data, method=True, string='Common name', \
+                            type="char", size=124, multi='cn', store=True), 
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI\
-                     that points to the directory information corresponding to the attendee."),
-        'language':  fields.function(_compute_data, method=True, string='Language',\
-                     type="selection", selection=_lang_get, multi='language',\
-                     store=True, help="To specify the language for text values in a\
-                      property or property parameter."),
-        'user_id': fields.many2one('res.users', 'User'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Contact'),
-        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one',\
-                        relation='res.partner', string='Partner', help="Partner related to contact"),
-        'email': fields.char('Email', size=124, help="Email of Invited Person"),
-        'event_date': fields.function(_compute_data, method=True, string='Event Date',\
-                             type="datetime", multi='event_date'),
-        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date',\
-                                 type="datetime", multi='event_end_date'),
-        'ref': fields.reference('Event Ref', selection=_links_get, size=128),
-        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
+that points to the directory information corresponding to the attendee."), 
+        'language': fields.function(_compute_data, method=True, string='Language', \
+                    type="selection", selection=_lang_get, multi='language', \
+                    store=True, help="To specify the language for text values in a\
+property or property parameter."), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
+        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
+                        relation='res.partner', string='Partner', help="Partner related to contact"), 
+        'email': fields.char('Email', size=124, help="Email of Invited Person"), 
+        'event_date': fields.function(_compute_data, method=True, string='Event Date', \
+                            type="datetime", multi='event_date'), 
+        'event_end_date': fields.function(_compute_data, method=True, \
+                            string='Event End Date', type="datetime", \
+                            multi='event_end_date'), 
+        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
+        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
      }
     _defaults = {
-        'state':  lambda *x: 'needs-action',
+        'state': lambda *x: 'needs-action', 
     }
 
     response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
@@ -421,7 +422,7 @@ request was delegated to"),
             if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
                 mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
                 status = mapping[msg_actions['state']]
-                print 'Got response for invitation id: %s as %s'  % (ids, status)
+                print 'Got response for invitation id: %s as %s' % (ids, status)
                 self.write(cr, uid, ids, {'state': status})
         return True
 
@@ -440,37 +441,37 @@ request was delegated to"),
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
             res_obj = att.ref
-            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
+            sub = '[%s Invitation][%d] %s' % (company, att.id, res_obj.name)
             att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref','=', att.ref._name + ',' + str(att.ref.id))])
+            other_invitaion_ids = self.search(cr, uid, [('ref', '=', att.ref._name + ',' + str(att.ref.id))])
             for att2 in self.browse(cr, uid, other_invitaion_ids):
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
-                                att2.email) +  ' - Status: ' + att2.state.title())
-            body_vals = {'name': res_obj.name,
-                'start_date': res_obj.date,
-                'end_date': res_obj.date_deadline or False,
-                'description': res_obj.description or '-',
-                'location': res_obj.location or '-',
-                'attendees': '<br>'.join(att_infos),
-                'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User',
-                'sign': sign,
-                'company': company
+                                att2.email) + ' - Status: ' + att2.state.title())
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or False, 
+                        'description': res_obj.description or '-', 
+                        'location': res_obj.location or '-', 
+                        'attendees': '<br>'.join(att_infos), 
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign, 
+                        'company': company
             }
             body = html_invitation % body_vals
             if mail_to and email_from:
                 tools.email_send(
-                    email_from,
-                    mail_to,
-                    sub,
-                    body,
-                    subtype='html',
-                    reply_to=email_from
-                )
+                        email_from, 
+                        mail_to, 
+                        sub, 
+                        body, 
+                        subtype='html', 
+                        reply_to=email_from
+                    )
             return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         """
-        Make entry on email and availbility  on change of user_id field.
+        Make entry on email and availbility on change of user_id field.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
@@ -496,7 +497,7 @@ request was delegated to"),
 
     def do_accept(self, cr, uid, ids, context=None, *args):
         """
-        Update state which value is  accepted.
+        Update state which value is accepted.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
@@ -512,7 +513,7 @@ request was delegated to"),
                 mod_obj = self.pool.get(vals.ref._name)
                 if vals.ref:
                     if vals.ref.user_id.id != user.id:
-                        defaults = {'user_id':  user.id}
+                        defaults = {'user_id': user.id}
                         new_event = mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
 
@@ -539,7 +540,7 @@ request was delegated to"),
             context = {}
         if not vals.get("email") and vals.get("cn"):
             cnval = vals.get("cn").split(':')
-            email =  filter(lambda x:x.__contains__('@'), cnval)
+            email = filter(lambda x:x.__contains__('@'), cnval)
             vals['email'] = email[0]
             vals['cn'] = vals.get("cn")
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
@@ -551,26 +552,30 @@ class res_alarm(osv.osv):
     _name = 'res.alarm'
     _description = 'Basic Alarm Information'
     _columns = {
-        'name':fields.char('Name', size=256, required=True),
-        'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
-                                        'Triggers', required=True),
-        'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
-                ('days', 'Days')], 'Interval', required=True),
-        'trigger_duration':  fields.integer('Duration', required=True),
-        'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
-                                       'The event ends')], 'Related to', required=True),
+        'name':fields.char('Name', size=256, required=True), 
+        'trigger_occurs': fields.selection([('before', 'Before'), \
+                                            ('after', 'After')], \
+                                        'Triggers', required=True), 
+        'trigger_interval': fields.selection([('minutes', 'Minutes'), \
+                                                ('hours', 'Hours'), \
+                                                ('days', 'Days')], 'Interval', \
+                                                required=True), 
+        'trigger_duration': fields.integer('Duration', required=True), 
+        'trigger_related': fields.selection([('start', 'The event starts'), \
+                                            ('end', 'The event ends')], \
+                                            'Related to', required=True), 
         'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
-are both optional, but if one occurs, so MUST the other"""),
-        'repeat': fields.integer('Repeat'),
+are both optional, but if one occurs, so MUST the other"""), 
+        'repeat': fields.integer('Repeat'), 
         'active': fields.boolean('Active', help="If the active field is set to \
                     true, it will allow you to hide the event alarm information without removing it.")
     }
     _defaults = {
-        'trigger_interval':  lambda *x: 'minutes',
-        'trigger_duration': lambda *x: 5,
-        'trigger_occurs': lambda *x: 'before',
-        'trigger_related': lambda *x: 'start',
-        'active': lambda *x: 1,
+        'trigger_interval': lambda *x: 'minutes', 
+        'trigger_duration': lambda *x: 5, 
+        'trigger_occurs': lambda *x: 'before', 
+        'trigger_related': lambda *x: 'start', 
+        'active': lambda *x: 1, 
     }
 
     def do_alarm_create(self, cr, uid, ids, model, date, context={}):
@@ -598,20 +603,20 @@ are both optional, but if one occurs, so MUST the other"""),
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
                 vals = {
-                    'action': 'display',
-                    'description': data.description,
-                    'name': data.name,
-                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))],
-                    'trigger_related': basic_alarm.trigger_related,
-                    'trigger_duration': basic_alarm.trigger_duration,
-                    'trigger_occurs': basic_alarm.trigger_occurs,
-                    'trigger_interval': basic_alarm.trigger_interval,
-                    'duration': basic_alarm.duration,
-                    'repeat': basic_alarm.repeat,
-                    'state': 'run',
-                    'event_date': data[date],
-                    'res_id': data.id,
-                    'model_id': model_id,
+                    'action': 'display', 
+                    'description': data.description, 
+                    'name': data.name, 
+                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
+                    'trigger_related': basic_alarm.trigger_related, 
+                    'trigger_duration': basic_alarm.trigger_duration, 
+                    'trigger_occurs': basic_alarm.trigger_occurs, 
+                    'trigger_interval': basic_alarm.trigger_interval, 
+                    'duration': basic_alarm.duration, 
+                    'repeat': basic_alarm.repeat, 
+                    'state': 'run', 
+                    'event_date': data[date], 
+                    'res_id': data.id, 
+                    'model_id': model_id, 
                     'user_id': uid
                  }
                 alarm_id = alarm_obj.create(cr, uid, vals)
@@ -640,7 +645,7 @@ are both optional, but if one occurs, so MUST the other"""),
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
                 cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
-                             where id=%s' % (model_obj._table, datas.id))
+                            where id=%s' % (model_obj._table, datas.id))
         cr.commit()
         return True
 
@@ -653,41 +658,40 @@ class calendar_alarm(osv.osv):
     __attribute__ = {}
 
     _columns = {
-        'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'),
-        'name': fields.char('Summary', size=124, help="""Contains the text to be \
-                     used as the message subject for email \
-                     or contains the text to be used for display"""),
-        'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
-                ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                required=True, help="Defines the action to be invoked when an alarm is triggered"),
-        'description': fields.text('Description', help='Provides a more complete \
-                            description of the calendar component, than that \
-                            provided by the "SUMMARY" property'),
-        'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                      'alarm_id', 'attendee_id', 'Attendees', readonly=True),
-        'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
-                     which is rendered when the alarm is triggered for audio,
-                    * File which is intended to be sent as message attachments for email,
-                    * Points to a procedure resource, which is invoked when\
-                      the alarm is triggered for procedure."""),
-        'res_id': fields.integer('Resource ID'),
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'user_id': fields.many2one('res.users', 'Owner'),
-        'event_date': fields.datetime('Event Date'),
-        'event_end_date': fields.datetime('Event End Date'),
-        'trigger_date': fields.datetime('Trigger Date', readonly="True"),
-        'state':fields.selection([
-                    ('draft', 'Draft'),
-                    ('run', 'Run'),
-                    ('stop', 'Stop'),
-                    ('done', 'Done'),
-                ], 'State', select=True, readonly=True),
-     }
+            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
+            'name': fields.char('Summary', size=124, help="""Contains the text to be \
+                        used as the message subject for email \
+                        or contains the text to be used for display"""), 
+            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
+                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
+                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
+            'description': fields.text('Description', help='Provides a more complete \
+                                description of the calendar component, than that \
+                                provided by the "SUMMARY" property'), 
+            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
+                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
+            'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
+                         which is rendered when the alarm is triggered for audio,
+                        * File which is intended to be sent as message attachments for email,
+                        * Points to a procedure resource, which is invoked when\
+                          the alarm is triggered for procedure."""), 
+            'res_id': fields.integer('Resource ID'), 
+            'model_id': fields.many2one('ir.model', 'Model'), 
+            'user_id': fields.many2one('res.users', 'Owner'), 
+            'event_date': fields.datetime('Event Date'), 
+            'event_end_date': fields.datetime('Event End Date'), 
+            'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
+            'state':fields.selection([('draft', 'Draft'), 
+                                        ('run', 'Run'), 
+                                        ('stop', 'Stop'), 
+                                        ('done', 'Done'), 
+                                    ], 'State', select=True, readonly=True), 
+        }
 
     _defaults = {
-        'action':  lambda *x: 'email',
-        'state': lambda *x: 'run',
-     }
+                'action': lambda *x: 'email', 
+                'state': lambda *x: 'run', 
+                }
 
     def create(self, cr, uid, vals, context={}):
         """
@@ -708,7 +712,7 @@ class calendar_alarm(osv.osv):
                 delta = timedelta(hours=vals['trigger_duration'])
             if vals['trigger_interval'] == 'minutes':
                 delta = timedelta(minutes=vals['trigger_duration'])
-            trigger_date =  dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
+            trigger_date = dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
             vals['trigger_date'] = trigger_date
         res = super(calendar_alarm, self).create(cr, uid, vals, context)
         return res
@@ -738,12 +742,12 @@ class calendar_alarm(osv.osv):
         for alarm in self.browse(cr, uid, alarm_ids):
             if alarm.action == 'display':
                 value = {
-                   'name': alarm.name,
-                   'act_from': alarm.user_id.id,
-                   'act_to': alarm.user_id.id,
-                   'body': alarm.description,
-                   'trigger_date': alarm.trigger_date,
-                   'ref_doc1':  '%s,%s'  % (alarm.model_id.model, alarm.res_id)
+                   'name': alarm.name, 
+                   'act_from': alarm.user_id.id, 
+                   'act_to': alarm.user_id.id, 
+                   'body': alarm.description, 
+                   'trigger_date': alarm.trigger_date, 
+                   'ref_doc1': '%s,%s' % (alarm.model_id.model, alarm.res_id)
                 }
                 request_id = request_obj.create(cr, uid, value)
                 request_ids = [request_id]
@@ -755,7 +759,7 @@ class calendar_alarm(osv.osv):
                 request_obj.request_send(cr, uid, request_ids)
 
             if alarm.action == 'email':
-                sub = '[Openobject Remainder] %s'  % (alarm.name)
+                sub = '[Openobject Remainder] %s' % (alarm.name)
                 body = """
                 Name: %s
                 Date: %s
@@ -772,9 +776,9 @@ class calendar_alarm(osv.osv):
                     mail_to.append(att.user_id.address_id.email)
                 if mail_to:
                     tools.email_send(
-                        tools.config.get('email_from', False),
-                        mail_to,
-                        sub,
+                        tools.config.get('email_from', False), 
+                        mail_to, 
+                        sub, 
                         body
                     )
             self.write(cr, uid, [alarm.id], {'state':'done'})
@@ -813,7 +817,7 @@ class calendar_event(osv.osv):
         if end_date and not duration:
             end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
             diff = end - start
-            duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
+            duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
             value['duration'] = round(duration, 2)
         elif not end_date:
             end = start + timedelta(hours=duration)
@@ -825,15 +829,16 @@ class calendar_event(osv.osv):
         Set rule string.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param id: List of  calendar event's ids.
+        @param id: List of calendar event's ids.
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
-        cr.execute("UPDATE %s set freq='',interval=0,count=0,end_date=Null,\
+        cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
-                    day=0,select1=False,month_list=0 ,byday=False where id=%s" % (self._table, id))
+                    day=0,select1='date',month_list=Null ,byday=Null where id=%s" % (self._table, id))
         
         if not value:
+            cr.execute("UPDATE %s set rrule_type='none' where id=%s" % (self._table, id))
             return True
         val = {}
         for part in value.split(';'):
@@ -846,7 +851,9 @@ class calendar_event(osv.osv):
         ans = value.split(';')
         for i in ans:
             val[i.split('=')[0].lower()] = i.split('=')[1].lower()
-        if int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
+        if not val.get('interval'):
+            rrule_type = 'custom'
+        elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
             rrule_type = 'custom'
 
         qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' "
@@ -873,8 +880,12 @@ class calendar_event(osv.osv):
     
                 if val.get('byday'):
                     d = val.get('byday')
-                    new_val['byday'] = d[:1]
-                    new_val['week_list'] = d[1:].upper()
+                    if '-' in d:
+                        new_val['byday'] = d[:2]
+                        new_val['week_list'] = d[2:4].upper()
+                    else:
+                        new_val['byday'] = d[:1]
+                        new_val['week_list'] = d[1:3].upper()
                     new_val['select1'] = 'day'
     
                 if val.get('bymonth'):
@@ -901,92 +912,100 @@ class calendar_event(osv.osv):
         Get rule string.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param id: List of  calendar event's ids.
+        @param id: List of calendar event's ids.
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
         result = {}
-        for datas in self.read(cr, uid, ids):
+        for datas in self.read(cr, uid, ids, context=context):
+            event = datas['id']
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
                 elif datas.get('rrule_type') == 'custom':
-                    rrule_custom = self.compute_rule_string(cr, uid, datas)
+                    if datas.get('interval', 0) < 0:
+                        raise osv.except_osv('Warning!', 'Interval can not be Negative')
+                    if datas.get('count', 0) < 0:
+                        raise osv.except_osv('Warning!', 'Count can not be Negative')
+                    rrule_custom = self.compute_rule_string(cr, uid, datas,\
+                                                         context=context)
                     result[event] = rrule_custom
                 else:
-                    result[event] = self.compute_rule_string(cr, uid, {'freq':\
-                                        datas.get('rrule_type').upper(), \
-                                      'interval': 1}, context=context)
+                    result[event] = self.compute_rule_string(cr, uid, {'freq': datas.get('rrule_type').upper(), 'interval': 1}, context=context)
 
         return result
 
     _columns = {
-        'id': fields.integer('ID'),
-        'sequence': fields.integer('Sequence'),
-        'name': fields.char('Description', size=64, required=True),
-        'date': fields.datetime('Date'),
-        'date_deadline': fields.datetime('Deadline'),
-        'create_date': fields.datetime('Created', readonly=True),
-        'duration': fields.float('Duration'),
-        'description': fields.text('Your action'),
+        'id': fields.integer('ID'), 
+        'sequence': fields.integer('Sequence'), 
+        'name': fields.char('Description', size=64, required=True), 
+        'date': fields.datetime('Date'), 
+        'date_deadline': fields.datetime('Deadline'), 
+        'create_date': fields.datetime('Created', readonly=True), 
+        'duration': fields.float('Duration'), 
+        'description': fields.text('Your action'), 
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
              ('confidential', 'Confidential')], 'Mark as'),
         'location': fields.char('Location', size=264, help="Location of Event"),
-        'show_as': fields.selection([('free', 'Free'), \
-              ('busy', 'Busy')], 'Show as'),
-        'base_calendar_url': fields.char('Caldav URL', size=264),
+        'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
+                                                'Show as'), 
+        'base_calendar_url': fields.char('Caldav URL', size=264), 
         'exdate': fields.text('Exception Date/Times', help="This property \
-                    defines the list of date/time exceptions for arecurring calendar component."),
+defines the list of date/time exceptions for arecurring calendar component."), 
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
-                    rule or repeating pattern for anexception to a recurrence set"),
-        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True,\
-                     string='Recurrent Rule', store=True, fnct_inv=_set_rrulestring),
+                    rule or repeating pattern for anexception to a recurrence set"), 
+        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
+                                    string='Recurrent Rule', store=True, \
+                                    fnct_inv=_set_rrulestring, help='Defines a\
+ rule or repeating pattern for recurring events\n\
+e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
+        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'), 
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
-            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
-        'alarm_id': fields.many2one('res.alarm', 'Alarm'),
-        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
-        'recurrent_uid': fields.integer('Recurrent ID'),
-        'recurrent_id': fields.datetime('Recurrent ID date'),
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24,\
-                         string='Timezone', store=True),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
+        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
+        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
+        'recurrent_uid': fields.integer('Recurrent ID'), 
+        'recurrent_id': fields.datetime('Recurrent ID date'), 
+        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, \
+                         string='Timezone', store=True), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
         'freq': fields.selection([('None', 'No Repeat'), \
-            ('secondly', 'Secondly'), \
-            ('minutely', 'Minutely'), \
-            ('hourly', 'Hourly'), \
-            ('daily', 'Daily'), \
-            ('weekly', 'Weekly'), \
-            ('monthly', 'Monthly'), \
-            ('yearly', 'Yearly')], 'Frequency'),
-        'interval': fields.integer('Interval'),
-        'count': fields.integer('Count'),
-        'mo': fields.boolean('Mon'),
-        'tu': fields.boolean('Tue'),
-        'we': fields.boolean('Wed'),
-        'th': fields.boolean('Thu'),
-        'fr': fields.boolean('Fri'),
-        'sa': fields.boolean('Sat'),
-        'su': fields.boolean('Sun'),
+                                ('secondly', 'Secondly'), \
+                                ('minutely', 'Minutely'), \
+                                ('hourly', 'Hourly'), \
+                                ('daily', 'Daily'), \
+                                ('weekly', 'Weekly'), \
+                                ('monthly', 'Monthly'), \
+                                ('yearly', 'Yearly')], 'Frequency'), 
+        'interval': fields.integer('Interval'), 
+        'count': fields.integer('Count'), 
+        'mo': fields.boolean('Mon'), 
+        'tu': fields.boolean('Tue'), 
+        'we': fields.boolean('Wed'), 
+        'th': fields.boolean('Thu'), 
+        'fr': fields.boolean('Fri'), 
+        'sa': fields.boolean('Sat'), 
+        'su': fields.boolean('Sun'), 
         'select1': fields.selection([('date', 'Date of month'), \
-            ('day', 'Day of month')], 'Option'),
-        'day': fields.integer('Date of month'),
+                                    ('day', 'Day of month')], 'Option'), 
+        'day': fields.integer('Date of month'), 
         'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-           ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-           ('FR', 'Friday'), ('SA', 'Saturday'), \
-           ('SU', 'Sunday')], 'Weekday'),
+                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
+                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
+                                   ('SU', 'Sunday')], 'Weekday'), 
         'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-           ('3', 'Third'), ('4', 'Fourth'), \
-           ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
-        'month_list': fields.selection(months.items(), 'Month'),
+                                   ('3', 'Third'), ('4', 'Fourth'), \
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
+        'month_list': fields.selection(months.items(), 'Month'), 
         'end_date': fields.date('Repeat Until')
     }
     _defaults = {
-         'class': lambda *a: 'public',
-         'show_as': lambda *a: 'busy',
-         'freq':  lambda *x: 'None',
-         'select1':  lambda *x: 'date',
-         'interval':  lambda *x: 1,
+         'class': lambda *a: 'public', 
+         'show_as': lambda *a: 'busy', 
+         'freq': lambda *x: 'None', 
+         'select1': lambda *x: 'date', 
+         'interval': lambda *x: 1, 
     }
 
     def modify_this(self, cr, uid, event_id, defaults, real_date, context=None, *args):
@@ -1004,11 +1023,11 @@ class calendar_event(osv.osv):
         event_id = base_calendar_id2real_id(event_id)
         datas = self.read(cr, uid, event_id, context=context)
         defaults.update({
-           'recurrent_uid': base_calendar_id2real_id(datas['id']),
-           'recurrent_id': defaults.get('date') or real_date,
-           'rrule_type': 'none',
-           'rrule': ''
-        })
+                        'recurrent_uid': base_calendar_id2real_id(datas['id']), 
+                        'recurrent_id': defaults.get('date') or real_date, 
+                        'rrule_type': 'none', 
+                        'rrule': ''
+                        })
         exdate = datas['exdate'] and datas['exdate'].split(',') or []
         if real_date and defaults.get('date'):
             exdate.append(real_date)
@@ -1032,7 +1051,7 @@ class calendar_event(osv.osv):
             defaults.update({'table': self._table})
 
             qry = "UPDATE %(table)s set name = '%(name)s', \
-                            date = '%(date)s',  date_deadline = '%(date_deadline)s'"
+                            date = '%(date)s', date_deadline = '%(date_deadline)s'"
             if defaults.get('alarm_id'):
                 qry += ", alarm_id = %(alarm_id)s"
             if defaults.get('location'):
@@ -1060,7 +1079,7 @@ class calendar_event(osv.osv):
         result = []
         if ids and (base_start_date or base_until_date):
             cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
-                            m.exdate  from "  + self._table + \
+                            m.exdate from " + self._table + \
                             " m where m.id in ("\
                             + ','.join(map(lambda x: str(x), ids))+")")
 
@@ -1129,7 +1148,7 @@ class calendar_event(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param datas: dictionary of freq and interval value.
-        @return: string value which compute  FREQILY;INTERVAL
+        @return: string value which compute FREQILY;INTERVAL
         """
 
         weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
@@ -1141,9 +1160,8 @@ class calendar_event(osv.osv):
         if freq == 'None':
             return ''
         
-        if datas.get('interval') < 1:
-                raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
-
+        interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
+        
         if freq == 'weekly':
 
             byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
@@ -1159,7 +1177,7 @@ class calendar_event(osv.osv):
                 monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
 
         elif freq == 'yearly':
-            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
+            if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
                 raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
             bymonth = ';BYMONTH=' + str(datas.get('month_list'))
             if datas.get('select1')=='day':
@@ -1170,19 +1188,19 @@ class calendar_event(osv.osv):
 
         if datas.get('end_date'):
             datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
-        enddate = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '') +\
+        enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
                              ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
 
-        rrule_string = 'FREQ=' + freq.upper() +  weekstring + ';INTERVAL=' + \
-                str(datas.get('interval')) + enddate + monthstring + yearstring
+        rrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \
+                            + enddate + monthstring + yearstring
 
         return rrule_string
 
 
-    def search(self, cr, uid, args, offset=0, limit=100, order=None,
+    def search(self, cr, uid, args, offset=0, limit=100, order=None, 
             context=None, count=False):
         """
-        Overrides  orm search method.
+        Overrides orm search method.
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
@@ -1248,7 +1266,7 @@ class calendar_event(osv.osv):
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
         """
-        Overrides  orm browse method.
+        Overrides orm browse method.
         @param self: the object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1269,7 +1287,7 @@ class calendar_event(osv.osv):
 
     def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
         """
-        Overrides  orm Read method.Read List of fields for calendar event.
+        Overrides orm Read method.Read List of fields for calendar event.
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
         @param ids: List of calendar event's id.
@@ -1285,8 +1303,7 @@ class calendar_event(osv.osv):
         if fields and 'date' not in fields:
             fields.append('date')
         for base_calendar_id, real_id in select:
-            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, \
-                                              load=load)
+            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res.get('duration', 0))
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
                 res['date'] = ls[1]
@@ -1328,7 +1345,7 @@ class calendar_event(osv.osv):
                 for record in self.read(cr, uid, [base_calendar_id2real_id(id)], \
                                             ['date', 'rrule', 'exdate']):
                     if record['rrule']:
-                        exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
+                        exdate = (record['exdate'] and (record['exdate'] + ',') or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
                         if record['date'] == date_new:
                             res = self.write(cr, uid, [base_calendar_id2real_id(id)], {'exdate': exdate})
                     else:
@@ -1396,14 +1413,14 @@ class calendar_todo(osv.osv):
         """
 
         event = self.browse(cr, uid, id, context=context)
-        cr.execute("UPDATE %s set date_start='%s' where id=%s"  \
-                           % (self._table, value, id))
+        cr.execute("UPDATE %s set date_start='%s' where id=%s" \
+                            % (self._table, value, id))
         return True
 
     _columns = {
         'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
-                            string='Duration', store=True, type='datetime'),
-        'duration': fields.integer('Duration'),
+                            string='Duration', store=True, type='datetime'), 
+        'duration': fields.integer('Duration'), 
     }
 
     __attribute__ = {}
@@ -1429,7 +1446,7 @@ class ir_attachment(osv.osv):
             args1.append(map(lambda x:str(x).split('-')[0], arg))
         return super(ir_attachment, self).search_count(cr, user, args1, context)
 
-    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
             context=None, count=False):
         """ 
         @param self: The object pointer
@@ -1445,8 +1462,8 @@ class ir_attachment(osv.osv):
         for i, arg in enumerate(new_args):
             if arg[0] == 'res_id':
                 new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
-                            limit=limit, order=order,
+        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
+                            limit=limit, order=order, 
                             context=context, count=False)
 ir_attachment()
 
@@ -1497,7 +1514,7 @@ class ir_model(osv.osv):
 
     _inherit = 'ir.model'
 
-    def read(self, cr, uid, ids, fields=None, context={},
+    def read(self, cr, uid, ids, fields=None, context={}, 
             load='_classic_read'):
         """ 
         Read IR Model
@@ -1557,7 +1574,7 @@ class res_users(osv.osv):
         res = {}
         attendee_obj = self.pool.get('calendar.attendee')
         attendee_ids = attendee_obj.search(cr, uid, [
-                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime),
+                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
                     ('state', '=', 'accepted'), ('user_id', 'in', ids)
                     ])
 
@@ -1589,8 +1606,9 @@ class res_users(osv.osv):
     _columns = {
             'availability': fields.function(_get_user_avail_fun, type='selection', \
                     selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True),
+                    string='Free/Busy', method=True), 
     }
 res_users()
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index d99e864a148..d17195f9a27 100755
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -35,7 +35,7 @@ class calendar_event_edit_all(osv.osv_memory):
         context_id = context and context.get('active_id', False) or False
         if context_id:
             if context.get('date'):
-                 return context.get('date')
+                return context.get('date')
             else:
                 model = context.get('model', False)
                 model_obj = self.pool.get(model)
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__openerp__.py
similarity index 95%
rename from addons/base_contact/__terp__.py
rename to addons/base_contact/__openerp__.py
index af632e532b5..df9992b2ab8 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -47,7 +47,10 @@
         'base_contact_view.xml',
         'process/base_contact_process.xml'
     ],
-    'demo_xml': ['base_contact_demo.xml'],
+    'demo_xml': ['base_contact_demo.xml'], 
+    'test': [
+        'test/base_contact00.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0031287885469',
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index d4fc8b2b007..9b4cc656acc 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -205,12 +205,12 @@ class res_partner_job(osv.osv):
                 self._order = 'sequence_contact'
 
                 contact_obj = self.pool.get('res.partner.contact')
-                search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
-                contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, \
-                                    limit=limit, order=order, context=context, count=count)
-                contacts = contact_obj.browse(cr, user, contact_ids, context=context)
-                for contact in contacts:
-                    job_ids.extend([item.id for item in contact.job_ids])
+                if arg[2] and not count:
+                    search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
+                    contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, limit=limit, order=order, context=context, count=count)
+                    contacts = contact_obj.browse(cr, user, contact_ids, context=context)
+                    for contact in contacts:
+                        job_ids.extend([item.id for item in contact.job_ids])
 
         res = super(res_partner_job,self).search(cr, user, args, offset=offset,\
                     limit=limit, order=order, context=context, count=count)
diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
new file mode 100644
index 00000000000..a1b112e4e2a
--- /dev/null
+++ b/addons/base_contact/test/base_contact00.yml
@@ -0,0 +1,96 @@
+-  |
+   I will test base_contact for following cases:
+    *contacts unrelated to a partner,
+    *contacts working at several addresses (possibly for different partners),
+    *contacts with possibly different functions for each of its job's addresses
+-  |
+   In order to assign language to contacts first I will create Language FR
+   (Remove)
+- 
+    !record {model: res.lang, id: res_lang_french0}:
+      code: fr_BE
+      date_format: '%m/%d/%Y'
+      decimal_point: .
+      direction: ltr
+      grouping: '[]'
+      name: French
+      time_format: '%H:%M:%S'
+-  |
+   In order to check contacts first I will create contact unrelated to a partner
+- 
+    !record {model: res.partner.contact, id: res_partner_contact_williams0}:
+        country_id: base.be
+        first_name: Laura
+        job_ids:
+            - email: lwilliams@mydomain.com
+              function_id: base_contact.res_partner_function_privateaddress0
+              phone: (+32).10.45.18.77
+              sequence_contact: 1
+              state: current
+        lang_id: res_lang_french0
+        mobile: (+32).10.45.18.77
+        name: Williams
+        title: Mss
+-   |
+    Now in order to assign this contact to partner I will create one partner assign contact laura to this partner
+- 
+    !record {model: res.partner, id: res_partner_laurascompany0}:
+        address:
+            - city: Namur
+              country_id: base.be
+              phone: (+32).10.45.18.77
+              street: 23, street ways
+              type: default
+              zip: '2324324'
+              job_ids:
+                - address_id: res_partner_address_1
+                  function_id: base.function_director
+                  contact_id: res_partner_contact_williams0
+                  sequence_partner: 2
+                  state: current
+        lang: fr_BE
+        name: Laura's Company
+        ref: LC
+        title: ltd
+-   |
+    Now I will check that the new job is assigned properly to contact or not
+-
+    !assert {model: res.partner.contact, id: res_partner_contact_williams0}:
+        - len(job_ids) > 2
+-   |
+    In order to check contacts working at several addresses for different partners
+    I will create contact with 2 different addresses
+- 
+  !record {model: res.partner.contact, id: res_partner_contact_pauwels0}:
+        country_id: base.be
+        first_name: Nicolas
+        job_ids:
+          - address_id: base.main_address
+            function_id: base.function_it
+            state: current
+          - address_id: base.res_partner_address_3000
+            function_id: base.function_director
+            state: current
+        lang_id: res_lang_french0
+        mobile: (+32).23.44.32.12
+        name: Pauwels
+        title: M.
+-   |
+    In order to check one contact working at one partner with different functions
+    I will create contact with 2 different jobs with different function but the same address
+- 
+  !record {model: res.partner.contact, id: res_partner_contact_mortier0}:
+    country_id: base.be
+    first_name: Christina
+    job_ids:
+      - address_id: base.res_partner_address_1
+        function_id: base.function_director
+        state: past
+      - address_id: base.res_partner_address_1
+        function_id: base.function_it
+        state: current
+    lang_id: base_contact.res_lang_french0
+    mobile: (+32).10.45.18.77
+    name: Mortier
+    title: Mss
+
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__openerp__.py
similarity index 100%
rename from addons/base_iban/__terp__.py
rename to addons/base_iban/__openerp__.py
diff --git a/addons/base_module_merge/i18n/ru.po b/addons/base_module_merge/i18n/ru.po
index e896011b7ce..0def5fa78c4 100644
--- a/addons/base_module_merge/i18n/ru.po
+++ b/addons/base_module_merge/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_publish/i18n/ru.po b/addons/base_module_publish/i18n/ru.po
index 626139138f2..41d6d0f5111 100644
--- a/addons/base_module_publish/i18n/ru.po
+++ b/addons/base_module_publish/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__openerp__.py
similarity index 100%
rename from addons/base_module_quality/__terp__.py
rename to addons/base_module_quality/__openerp__.py
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__openerp__.py
similarity index 100%
rename from addons/base_module_record/__terp__.py
rename to addons/base_module_record/__openerp__.py
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index cda1f4ebb82..97c0ada4bca 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -143,7 +143,7 @@ class base_module_record(osv.osv):
         obj = dt.browse(cr, uid, dtids[0])
         self.depends[obj.module] = True
         return obj.module+'.'+obj.name, obj.noupdate
-
+    
     def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
         
         data_pool = self.pool.get('ir.model.data')
@@ -384,7 +384,7 @@ class base_module_record(osv.osv):
         elif rec[3]=='create':
             id = self._create_id(cr, uid, rec[2],rec[4])
             record,noupdate = self._create_record(cr, uid, doc, rec[2], rec[4], id)
-            self.ids[(rec[3], result)] = id
+            self.ids[(rec[2], result)] = id
             record_list += record
 
         elif rec[3]=='copy':
@@ -446,8 +446,8 @@ class base_module_record(osv.osv):
                     terp.appendChild(data)
                     wkf = doc.createElement('workflow')
                     data.appendChild(wkf)
-                    wkf.setAttribute("model", rec[1][3])
-                    wkf.setAttribute("action", rec[1][4])
+                    wkf.setAttribute("model", rec[1][2])
+                    wkf.setAttribute("action", rec[1][3])
                     if noupdate:
                         data.setAttribute("noupdate", "1")
                     wkf.setAttribute("ref", rec_id)
@@ -482,10 +482,12 @@ class base_module_record(osv.osv):
                     continue
                 if self.mode == "workflow":
                     record= self._generate_object_yaml(cr, uid, rec[1],rec[0])
+                    yaml_file+="!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n'''
                     object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
-                    yaml_file += str(object) + '''\n'''
+                    yaml_file += str(object) + '''\n\n'''
                 else:
                     record= self._generate_object_yaml(cr, uid, rec[1],rec[3])
+                    yaml_file+="!comment Creating an %s record"%(record['model']) + '''\n'''
                     object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
                     yaml_file += str(object) + '''\n'''
                     attrs=yaml.dump(object.attrs, default_flow_style=False)
@@ -497,7 +499,9 @@ class base_module_record(osv.osv):
             if line.find('!record') == 0:
                 line = "- \n" + "  " + line
             elif line.find('!workflow') == 0:
-                line = "- \n" + "  " + line                    
+                line = "- \n" + "  " + line
+            elif line.find('!comment') == 0:
+                line=line.replace('!comment','- \n ')   
             elif line.find('- -') != -1:
                 line=line.replace('- -','  -')
                 line = "    " + line
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 3ea600a1700..b048d092d41 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__openerp__.py
similarity index 100%
rename from addons/base_report_creator/__terp__.py
rename to addons/base_report_creator/__openerp__.py
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index db54fa6ceae..021bcbb5998 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -37,8 +37,8 @@
         <field name="arch" type="xml">
             <form string="Report Creator">
                 <field name="name" select="1" colspan="4"/>
-                <field name="type" select="2"/>
-                <field name="active" select="2"/>
+                <field name="type"/>
+                <field name="active"/>
                 <notebook colspan="4">
                 <page string="General Configuration">
                     <field name="model_ids" colspan="4"
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__openerp__.py
similarity index 100%
rename from addons/base_report_designer/__terp__.py
rename to addons/base_report_designer/__openerp__.py
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__openerp__.py
similarity index 100%
rename from addons/base_setup/__terp__.py
rename to addons/base_setup/__openerp__.py
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index a28c7744158..0feb39bd563 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -17,6 +17,7 @@
                      string="You can start configuring the system or connect directly to the database using the default setup."/>
             </group>
           </group>
+          <separator string="" colspan="4"/>
           <button name="menu" icon="gtk-ok" type="object"
                   string="Use Directly"/>
           <button name="config" icon="gtk-go-forward" type="object"
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index df2c5908de9..7a6d61a0e08 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -50,8 +50,8 @@ If you don't think you need any of these right now, you can easily install them
     </record>
 
     <record id="base_setup_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_base_setup_installer"/>
-      <field name="sequence">2</field>
+        <field name="action_id" ref="action_base_setup_installer"/>
+        <field name="sequence">2</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index c6baf194c6e..08691e60d35 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -14,7 +14,7 @@
           <group string="res_config_contents" position="replace">
             <field name="company_id" invisible="1"/>
 
-            <separator string="Define Main Company" colspan="4"/>
+            <separator string="Configure Your Company" colspan="4"/>
             <field name="name" colspan="4" required="True"/>
             <newline/>
             <field name="street"/>
@@ -54,8 +54,9 @@
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_base_setup_company"/>
-      <field name="sequence">1</field>
+        <field name="action_id" ref="action_base_setup_company"/>
+        <field name="sequence">1</field>
+        <field name="restart">onskip</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__openerp__.py
similarity index 100%
rename from addons/base_vat/__terp__.py
rename to addons/base_vat/__openerp__.py
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index 287ad0ada8c..325c2c1ea4c 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -9,7 +9,7 @@
       <field name="arch" type="xml">
         <field name="property_account_payable" position="after">
             <group colspan="2" col="6">
-              <field name="vat" on_change="vat_change(vat)" select="2" colspan="4" />
+              <field name="vat" on_change="vat_change(vat)" colspan="4" />
               <field name="vat_subjected" colspan="1"/>
             </group>
         </field>
diff --git a/addons/board/__terp__.py b/addons/board/__openerp__.py
similarity index 100%
rename from addons/board/__terp__.py
rename to addons/board/__openerp__.py
diff --git a/addons/board_account/__terp__.py b/addons/board_account/__openerp__.py
similarity index 100%
rename from addons/board_account/__terp__.py
rename to addons/board_account/__openerp__.py
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__openerp__.py
similarity index 100%
rename from addons/board_association/__terp__.py
rename to addons/board_association/__openerp__.py
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__openerp__.py
similarity index 100%
rename from addons/board_auction/__terp__.py
rename to addons/board_auction/__openerp__.py
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__openerp__.py
similarity index 100%
rename from addons/board_crm_configuration/__terp__.py
rename to addons/board_crm_configuration/__openerp__.py
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__openerp__.py
similarity index 96%
rename from addons/board_document/__terp__.py
rename to addons/board_document/__openerp__.py
index 77fd09fdf45..3dcd00627b4 100644
--- a/addons/board_document/__terp__.py
+++ b/addons/board_document/__openerp__.py
@@ -32,7 +32,7 @@
         * Files by Month (graph)
     """,
     'author': 'Tiny',
-    'depends': ['board', 'document', 'report_document'],
+    'depends': ['board', 'document'],
     'update_xml': ['board_document_view.xml'],
     'demo_xml': ['board_document_demo.xml'],
     'installable': True,
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index ec2b9d69de1..4d89f96cbfb 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -15,24 +15,24 @@
                         <child1>
                             <action
                                 string="New Files"
-                                name="%(report_document.action_view_all_document_tree1)d"
+                                name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree"
-                                domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/>
+                                domain="[('name','=',time.strftime('%%Y')),('month','=',time.strftime('%%m'))]"/>
 
                             <action
                                 string="File Size by Month"
-                                name="%(report_document.action_view_size_month)d"
+                                name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
                         </child1>
                         <child2>
                             <action
                                 string="Files by Resource Type"
-                                name="%(report_document.action_view_document_by_resourcetype_graph)d"
+                                name="%(document.action_view_document_by_resourcetype_graph)d"
                                 view_mode="graph,tree"/>
 
                             <action
                                 string="Files by Partner"
-                                name="%(report_document.action_view_files_by_partner)d"
+                                name="%(document.action_view_files_by_partner)d"
                                 view_mode="graph,tree"/>
                         </child2>
                      </hpaned>
@@ -75,19 +75,19 @@
                         <child1>
                             <action
                                 string="Wall of Shame"
-                                name="%(report_document.action_view_wall)d"
+                                name="%(document.action_view_wall)d"
                                 view_mode="tree"/>
 
                         </child1>
                         <child2>
                             <action
                                 string="Files by Users"
-                                name="%(report_document.action_view_user_graph)d"
+                                name="%(document.action_view_user_graph)d"
                                 view_mode="graph,tree"/>
 
                             <action
                                 string="Files by Month"
-                                name="%(report_document.action_view_files_by_month_graph)d"
+                                name="%(document.action_view_files_by_month_graph)d"
                                 view_mode="graph,tree"/>
                         </child2>
                      </hpaned>
diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__openerp__.py
similarity index 100%
rename from addons/board_hr/__terp__.py
rename to addons/board_hr/__openerp__.py
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__openerp__.py
similarity index 100%
rename from addons/board_manufacturing/__terp__.py
rename to addons/board_manufacturing/__openerp__.py
diff --git a/addons/board_project/__terp__.py b/addons/board_project/__openerp__.py
similarity index 100%
rename from addons/board_project/__terp__.py
rename to addons/board_project/__openerp__.py
diff --git a/addons/board_sale/__terp__.py b/addons/board_sale/__openerp__.py
similarity index 100%
rename from addons/board_sale/__terp__.py
rename to addons/board_sale/__openerp__.py
diff --git a/addons/board_warehouse/__terp__.py b/addons/board_warehouse/__openerp__.py
similarity index 100%
rename from addons/board_warehouse/__terp__.py
rename to addons/board_warehouse/__openerp__.py
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__openerp__.py
similarity index 100%
rename from addons/caldav/__terp__.py
rename to addons/caldav/__openerp__.py
diff --git a/addons/crm/__terp__.py b/addons/crm/__openerp__.py
similarity index 100%
rename from addons/crm/__terp__.py
rename to addons/crm/__openerp__.py
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 09901defab4..adfbf0ca772 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -30,51 +30,51 @@ from tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft', 'Draft'),
-    ('open', 'Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
+    ('draft', 'Draft'), 
+    ('open', 'Open'), 
+    ('cancel', 'Cancelled'), 
+    ('done', 'Closed'), 
     ('pending', 'Pending')
 ]
 
 AVAILABLE_PRIORITIES = [
-    ('5', 'Lowest'),
-    ('4', 'Low'),
-    ('3', 'Normal'),
-    ('2', 'High'),
+    ('5', 'Lowest'), 
+    ('4', 'Low'), 
+    ('3', 'Normal'), 
+    ('2', 'High'), 
     ('1', 'Highest')
 ]
 
 class crm_case_section(osv.osv):
-    """ Cases Section"""
+    """Sales Team"""
 
     _name = "crm.case.section"
     _description = "Sales Teams"
     _order = "name"
 
     _columns = {
-        'name': fields.char('Sales Team', size=64, required=True, translate=True),
-        'code': fields.char('Code', size=8),
+        'name': fields.char('Sales Team', size=64, required=True, translate=True), 
+        'code': fields.char('Code', size=8), 
         'active': fields.boolean('Active', help="If the active field is set to \
-                        true, it will allow you to hide the sales team without removing it."),
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
-        'user_id': fields.many2one('res.users', 'Responsible User'),
+                        true, it will allow you to hide the sales team without removing it."), 
+        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), 
+        'user_id': fields.many2one('res.users', 'Responsible User'), 
         'reply_to': fields.char('Reply-To', size=64, help="The email address put \
                         in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
-        'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
-        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
+        'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
+        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'server_id':fields.many2one('email.smtpclient', 'Server ID'),
         'note': fields.text('Description'),
     }
 
     _defaults = {
-        'active': lambda *a: 1,
-        'allow_unlink': lambda *a: 1,
+        'active': lambda *a: 1, 
+        'allow_unlink': lambda *a: 1, 
     }
 
     _sql_constraints = [
-        ('code_uniq', 'unique (code)', 'The code of the section must be unique !')
+        ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
     ]
 
     def _check_recursion(self, cr, uid, ids):
@@ -100,18 +100,20 @@ class crm_case_section(osv.osv):
         (_check_recursion, 'Error ! You cannot create recursive sections.', ['parent_id'])
     ]
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         """Overrides orm name_get method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of section ids
         """
+        if not context:
+            context = {}
 
-        if not len(ids):
-            return []
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
         res = []
+        if not ids:
+            return res
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
 
         for record in reads:
             name = record['name']
@@ -119,6 +121,7 @@ class crm_case_section(osv.osv):
                 name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
+
 crm_case_section()
 
 
@@ -129,13 +132,13 @@ class crm_case_categ(osv.osv):
     _description = "Category of case"
 
     _columns = {
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
+        'name': fields.char('Case Category Name', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
     def _find_object_id(self, cr, uid, context=None):
 
-        """
+        """Finds id for case object
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -149,7 +152,7 @@ class crm_case_categ(osv.osv):
     _defaults = {
         'object_id' : _find_object_id
     }
-#
+
 crm_case_categ()
 
 
@@ -161,19 +164,17 @@ class crm_case_resource_type(osv.osv):
     _rec_name = "name"
 
     _columns = {
-        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
+        'name': fields.char('Case Resource Type', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
     def _find_object_id(self, cr, uid, context=None):
-        """
+        """Finds id for case object
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
-
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
@@ -194,46 +195,44 @@ class crm_case_stage(osv.osv):
     _order = "sequence"
 
     _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'name': fields.char('Stage Name', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
         'sequence': fields.integer('Sequence', help="Gives the sequence order \
-                        when displaying a list of case stages."),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
-        'probability': fields.float('Probability (%)', required=True),
-        'on_change': fields.boolean('Change Probability Automatically',\
-                         help="Change Probability on next and previous stages."),
+                        when displaying a list of case stages."), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
+        'probability': fields.float('Probability (%)', required=True), 
+        'on_change': fields.boolean('Change Probability Automatically', \
+                         help="Change Probability on next and previous stages."), 
         'requirements': fields.text('Requirements')
     }
     def _find_object_id(self, cr, uid, context=None):
-
-        """
+        """Finds id for case object
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
 
     _defaults = {
-        'sequence': lambda *args: 1,
-        'probability': lambda *args: 0.0,
+        'sequence': lambda *args: 1, 
+        'probability': lambda *args: 0.0, 
         'object_id' : _find_object_id
     }
 
 crm_case_stage()
 
-def _links_get(self, cr, uid, context={}):
+def _links_get(self, cr, uid, context=None):
+    """Gets links value for reference field
+    @param self: The object pointer
+    @param cr: the current row, from the database cursor,
+    @param uid: the current user’s ID for security checks,
+    @param context: A standard dictionary for contextual values
     """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-
-
+    if not context:
+        context = {}
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
@@ -246,16 +245,13 @@ class crm_case(osv.osv):
     _description = "Case"
 
     def _email_last(self, cursor, user, ids, name, arg, context=None):
-
-        """Return History
+        """Return last email from History
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case’s IDs
         @param context: A standard dictionary for contextual values
         """
-
-
         res = {}
         for case in self.browse(cursor, user, ids):
             if case.history_line:
@@ -264,30 +260,31 @@ class crm_case(osv.osv):
                 res[case.id] = False
         return res
 
-    def copy(self, cr, uid, id, default=None, context={}):
-
-        """
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides orm copy method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case’s IDs
         @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         if not default:
             default = {}
         default.update({'state': 'draft', 'id': False})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
-    def _get_log_ids(self, cr, uid, ids, field_names, arg, context={}):
-
-        """
+    def _get_log_ids(self, cr, uid, ids, field_names, arg, context=None):
+        """Gets id for case log from history of particular case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case log’s IDs
+        @param ids: List of Case IDs
         @param context: A standard dictionary for contextual values
         """
+        if not context:
+            context = {}
 
         result = {}
         history_obj = False
@@ -306,7 +303,7 @@ class crm_case(osv.osv):
 
         for case in self.browse(cr, uid, ids, context):
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]),\
+            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), \
                                          ('res_id', '=', case.id)])
             if history_ids:
                 result[case.id] = {name: history_ids}
@@ -316,64 +313,60 @@ class crm_case(osv.osv):
         return result
 
     _columns = {
-        'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Description', size=1024, required=True),
+        'id': fields.integer('ID', readonly=True), 
+        'name': fields.char('Description', size=1024, required=True), 
         'active': fields.boolean('Active', help="If the active field is set to\
-                     true, it will allow you to hide the case without removing it."),
-        'description': fields.text('Description'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team',\
+                     true, it will allow you to hide the case without removing it."), 
+        'description': fields.text('Description'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'),
-        'email_from': fields.char('Email', size=128, help="These people will receive email."),
+                             Define Responsible user and Email account for mail gateway.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
                              will receive a copy of the future" \
-                            " communication between partner and users by email"),
-        'probability': fields.float('Probability'),
-        'email_last': fields.function(_email_last, method=True,
-            string='Latest E-Mail', type='text'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact',\
-                                 domain="[('partner_id','=',partner_id)]"),
-        'create_date': fields.datetime('Creation Date' , readonly=True),
-        'write_date': fields.datetime('Update Date' , readonly=True),
-        'date_deadline': fields.date('Deadline'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-        'history_line': fields.function(_get_log_ids, method=True, type='one2many',\
-                         multi="history_line", relation="crm.case.history", string="Communication"),
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many',\
-                         multi="log_ids", relation="crm.case.log", string="Logs History"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                            " communication between partner and users by email"), 
+        'probability': fields.float('Probability'), 
+        'email_last': fields.function(_email_last, method=True, 
+            string='Latest E-Mail', type='text'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+        'create_date': fields.datetime('Creation Date' , readonly=True), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'date_deadline': fields.date('Deadline'), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'history_line': fields.function(_get_log_ids, method=True, type='one2many', \
+                         multi="history_line", relation="crm.case.history", string="Communication"), 
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', \
+                         multi="log_ids", relation="crm.case.log", string="Logs History"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                          domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+                        ('object_id.model', '=', 'crm.opportunity')]"), 
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-        'company_id': fields.many2one('res.company', 'Company'),
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
+        'company_id': fields.many2one('res.company', 'Company'), 
     }
     def _get_default_partner_address(self, cr, uid, context):
-
-        """
+        """Gives id of default address for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if not context.get('portal', False):
             return False
         return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
 
     def _get_default_partner(self, cr, uid, context):
-
-        """
+        """Gives id of partner for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
@@ -382,14 +375,12 @@ class crm_case(osv.osv):
         return user.address_id.partner_id.id
 
     def _get_default_email(self, cr, uid, context):
-
-        """
+        """Gives default email address for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
@@ -398,63 +389,66 @@ class crm_case(osv.osv):
         return user.address_id.email
 
     def _get_default_user(self, cr, uid, context):
-        """
+        """Gives current user id
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if context.get('portal', False):
             return False
         return uid
 
     def _get_section(self, cr, uid, context):
-        """
+        """Gives section id for current User
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
     _defaults = {
-        'active': lambda *a: 1,
-        'user_id': _get_default_user,
-        'partner_id': _get_default_partner,
-        'partner_address_id': _get_default_partner_address,
-        'email_from': _get_default_email,
-        'state': lambda *a: 'draft',
-        'section_id': _get_section,
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
+        'active': lambda *a: 1, 
+        'user_id': _get_default_user, 
+        'partner_id': _get_default_partner, 
+        'partner_address_id': _get_default_partner_address, 
+        'email_from': _get_default_email, 
+        'state': lambda *a: 'draft', 
+        'section_id': _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
     }
 
     _order = 'date_deadline desc, create_date desc,id desc'
 
-    def unlink(self, cr, uid, ids, context={}):
-
-        """
+    def unlink(self, cr, uid, ids, context=None):
+        """Overrides orm unlink method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case’s IDs
-        @param context: A standard dictionary for contextual values"""
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if not context:
+            context = {}
 
         for case in self.browse(cr, uid, ids, context):
             if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
-                raise osv.except_osv(_('Warning !'),
+                raise osv.except_osv(_('Warning !'), 
                     _('You can not delete this case. You should better cancel it.'))
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
-    def stage_next(self, cr, uid, ids, context={}):
-        """
+    def stage_next(self, cr, uid, ids, context=None):
+        """This function computes next stage for case from its current stage
+             using available stage for that case type 
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of stage next’s IDs
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
@@ -465,15 +459,17 @@ class crm_case(osv.osv):
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
         return True
 
-    def get_stage_dict(self, cr, uid, ids, context={}):
-        """
+    def get_stage_dict(self, cr, uid, ids, context=None):
+        """This function gives dictionary for stage according to stage levels
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of stage dict’s IDs
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
-        sid = self.pool.get('crm.case.stage').search(cr, uid,\
+        sid = self.pool.get('crm.case.stage').search(cr, uid, \
                             [('object_id.model', '=', self._name)], context=context)
         s = {}
         previous = {}
@@ -484,20 +480,23 @@ class crm_case(osv.osv):
             previous[section] = stage.id
         return s
 
-    def stage_previous(self, cr, uid, ids, context={}):
-        """
+    def stage_previous(self, cr, uid, ids, context=None):
+        """This function computes previous stage for case from its current stage
+             using available stage for that case type 
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of stage previous’s IDs
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             section = (case.section_id.id or False)
 
             if section in s:
-                st = case.stage_id.id  or False
+                st = case.stage_id.id or False
                 s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
                 if st in s[section]:
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
@@ -508,12 +507,17 @@ class crm_case(osv.osv):
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of History’s IDs
+        @param ids: List of Case ids
+        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
+        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param email: Email address if any
+        @param details: Details of case history if any 
         @param context: A standard dictionary for contextual values"""
-
+        if not context:
+            context = {}
 
         model_obj = self.pool.get('ir.model')
-
+        obj = self.pool.get('crm.case.log')
         for case in cases:
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
             data = {
@@ -526,33 +530,31 @@ class crm_case(osv.osv):
                 'message_id':message_id
             }
 
-            obj = self.pool.get('crm.case.log')
             if history:
                 obj = self.pool.get('crm.case.history')
                 data['description'] = details or case.description
                 data['email_to'] = email or \
                         (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from',False)
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
                 data['email_from'] = email_from or \
                         (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from',False)
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
             res = obj.create(cr, uid, data, context)
         return True
+    
     _history = __history
     history = __history
 
     def create(self, cr, uid, *args, **argv):
-
-        """
+        """Overrides orm create method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param *args: Give Tuple Value
-        @Paran **args: Give Dictionay of Keyword Value
+        @param *args: Tuple Value for additional Params
+        @param **argv: Dictionay of Keyword Params
         """
-
         res = super(crm_case, self).create(cr, uid, *args, **argv)
         cases = self.browse(cr, uid, [res])
         cases[0].state # to fill the browse record cache
@@ -560,97 +562,33 @@ class crm_case(osv.osv):
         return res
 
     def add_reply(self, cursor, user, ids, context=None):
-
-        """
+        """This function finds last email and gives its description value for reply mail
         @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
+        @param cursor: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values
         """
-
         for case in self.browse(cursor, user, ids, context=context):
             if case.email_last:
                 description = case.email_last
                 self.write(cursor, user, case.id, {
-                    'description': '> ' + description.replace('\n', '\n> '),
+                    'description': '> ' + description.replace('\n', '\n> '), 
                     }, context=context)
         return True
 
-    def case_log(self, cr, uid, ids, context={}, email=False, *args):
-
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        @param *args: Give Tuple Value
-        """
-
-        cases = self.browse(cr, uid, ids)
-        self.__history(cr, uid, cases, _('Historize'), history=True, email=email)
-        return self.write(cr, uid, ids, {'description': False, 'som': False,
-            'canal_id': False})
-
-    def case_log_reply(self, cr, uid, ids, context={}, email=False, *args):
-
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        @param *args: Give Tuple Value
-        """
-
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            if not case.email_from:
-                raise osv.except_osv(_('Error!'),
-                        _('You must put a Partner eMail to use this action!'))
-
-            if not case.user_id:
-                raise osv.except_osv(_('Error!'),
-                        _('You must define a responsible user for this case in order to use this action!'))
-
-            if not case.description:
-                raise osv.except_osv(_('Error!'),
-                        _('Can not send mail with empty body,you should have description in the body'))
-
-        self.__history(cr, uid, cases, _('Send'), history=True, email=False)
-        for case in cases:
-            self.write(cr, uid, [case.id], {
-                'description': False,
-                })
-            emails = [case.email_from] + (case.email_cc or '').split(',')
-            emails = filter(None, emails)
-            body = case.description or ''
-            if case.user_id.signature:
-                body += '\n\n%s' % (case.user_id.signature)
-
-            emailfrom = case.user_id.address_id and case.user_id.address_id.email or False
-            if not emailfrom:
-                raise osv.except_osv(_('Error!'),
-                        _("No E-Mail ID Found for your Company address!"))
-
-            tools.email_send(
-                emailfrom,
-                emails,
-                '[' + str(case.id) + '] ' + case.name,
-                self.format_body(body),
-                reply_to = case.section_id.reply_to,
-                openobject_id = str(case.id)
-            )
-            self.__history(cr, uid, [case], _('Send'), history=True, email=emails, details=body, email_from=emailfrom)
-        return True
-
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """
+        """This function returns value of partner address based on partner
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param part: Partner's id
+        @email: Partner's email ID 
         """
         if not part:
-            return {'value': {'partner_address_id': False,
-                            'email_from': False,
+            return {'value': {'partner_address_id': False, 
+                            'email_from': False, 
                             }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
@@ -658,29 +596,27 @@ class crm_case(osv.osv):
         return {'value': data}
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-
-        """
+        """This function returns value of partner email based on Partner Address
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param add: Id of Partner's address
+        @email: Partner's email ID 
         """
-
-        data = {}
         if not add:
             return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        data['email_from'] = address.email
-        return {'value': data}
+        return {'value': {'email_from': address.email}}
 
     def case_close(self, cr, uid, ids, *args):
-        """
+        """Closes Case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Close'))
@@ -692,14 +628,13 @@ class crm_case(osv.osv):
         return True
 
     def case_escalate(self, cr, uid, ids, *args):
-        """
+        """Escalates case to top level
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         for case in cases:
             data = {'active': True, 'user_id': False}
@@ -710,42 +645,39 @@ class crm_case(osv.osv):
                     data['user_id'] = case.section_id.parent_id.user_id.id
             else:
                 raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
-            self.write(cr, uid, ids, data)
+            self.write(cr, uid, [case.id], data)
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Escalate'))
         self._action(cr, uid, cases, 'escalate')
         return True
 
-
     def case_open(self, cr, uid, ids, *args):
-        """
+        """Opens Case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Open'))
+
         for case in cases:
             data = {'state': 'open', 'active': True}
             if not case.user_id:
                 data['user_id'] = uid
-            self.write(cr, uid, ids, data)
+            self.write(cr, uid, case.id, data)
         self._action(cr, uid, cases, 'open')
         return True
 
-
     def case_cancel(self, cr, uid, ids, *args):
-        """
+        """Cancels Case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Cancel'))
@@ -754,15 +686,13 @@ class crm_case(osv.osv):
         return True
 
     def case_pending(self, cr, uid, ids, *args):
-
-        """
+        """Marks case as pending
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Pending'))
@@ -771,15 +701,13 @@ class crm_case(osv.osv):
         return True
 
     def case_reset(self, cr, uid, ids, *args):
-
-        """
+        """Resets case as draft
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Draft'))
@@ -797,16 +725,16 @@ class crm_case_log(osv.osv):
 
     _order = "id desc"
     _columns = {
-        'name': fields.char('Status', size=64),
-        'date': fields.datetime('Date'),
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'model_id': fields.many2one('ir.model', "Model"),
-        'res_id': fields.integer('Resource ID'),
+        'name': fields.char('Status', size=64), 
+        'date': fields.datetime('Date'), 
+        'section_id': fields.many2one('crm.case.section', 'Section'), 
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
+        'model_id': fields.many2one('ir.model', "Model"), 
+        'res_id': fields.integer('Resource ID'), 
     }
 
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
     }
 
 crm_case_log()
@@ -820,14 +748,13 @@ class crm_case_history(osv.osv):
     _inherits = {'crm.case.log': "log_id"}
 
     def _note_get(self, cursor, user, ids, name, arg, context=None):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of case History’s IDs
-            @param context: A standard dictionary for contextual values
+        """ Gives case History Description
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case History’s IDs
+        @param context: A standard dictionary for contextual values
         """
-
         res = {}
         for hist in self.browse(cursor, user, ids, context or {}):
             res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
@@ -850,7 +777,7 @@ class users(osv.osv):
     _inherit = 'res.users'
     _description = "Users"
     _columns = {
-        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 users()
 
@@ -858,7 +785,7 @@ users()
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 res_partner()
 
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 6e6e9b9fcaa..718b12bb9c3 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -70,7 +70,7 @@ class case(osv.osv):
         """
         for case in self.browse(cr, uid, ids):
             if not case.section_id.reply_to:
-                raise osv.except_osv(_('Error!'), ("Reply To is not specified in Section"))
+                raise osv.except_osv(_('Error!'), ("Reply To is not specified in the sales team"))
             if not case.email_from:
                 raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
             if case.section_id.reply_to and case.email_from:
@@ -259,11 +259,11 @@ class base_action_rule_line(osv.osv):
         return res + crm.AVAILABLE_PRIORITIES
 
     _columns = {
-        'trg_section_id': fields.many2one('crm.case.section', 'Section'),
+        'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'trg_max_history': fields.integer('Maximum Communication History'),
         'trg_categ_id':  fields.many2one('crm.case.categ', 'Category'),
         'regex_history' : fields.char('Regular Expression on Case History', size=128),
-        'act_section_id': fields.many2one('crm.case.section', 'Set section to'),
+        'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
         'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
         'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this \
                                 if you want the rule to send an email to the partner."),
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index f235c9ae637..7b52343342e 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -1,52 +1,53 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-	    <menuitem id="base.menu_aftersale" name="After-Sale Services"
-	    	parent="base.menu_base_partner" sequence="6" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services"
+            groups="base.group_extended"
+            parent="base.menu_base_partner" sequence="6" />
 
-	    <!-- Claims Menu -->
+        <!-- Claims Menu -->
 
-	    <record model="ir.actions.act_window" id="crm_case_categ_claim0">
-	        <field name="name">Claims</field>
-	        <field name="res_model">crm.claim</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,calendar,form,graph</field>
-	        <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>	        
-	        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
-	    </record>
+        <record model="ir.actions.act_window" id="crm_case_categ_claim0">
+            <field name="name">Claims</field>
+            <field name="res_model">crm.claim</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_id" ref="crm_case_claims_tree_view"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>            
+            <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="crm_case_claims_tree_view"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_claims_tree_view"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">calendar</field>
-	        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">calendar</field>
+            <field name="view_id" ref="crm_case_claims_calendar_view"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
-	        <field name="sequence" eval="3"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="crm_case_claims_form_view"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_claims_form_view"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
-	        <field name="sequence" eval="4"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <menuitem name="Claims" id="menu_crm_case_claims"
-	    	parent="base.menu_aftersale" action="crm_case_categ_claim0" />
+        <menuitem name="Claims" id="menu_crm_case_claims"
+            parent="base.menu_aftersale" action="crm_case_categ_claim0" />
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index c7409006d78..722c1f3db94 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -108,7 +108,7 @@
                     </group>
                     <separator colspan="4" string="Status and Categorization"/>
                     <group colspan="4" col="6">
-                        <field name="user_id" string="Responsible" select="2"/>
+                        <field name="user_id" string="Responsible"/>
                         <field name="section_id" widget="selection"/>
                         <label string="Stage: " align="1.0"/>
                         <group colspan="1" col="2">
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index c0994aee5cd..bc4b91fa409 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -5,7 +5,8 @@
 <!-- MENU -->
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
-    	parent="base.menu_base_partner" sequence="7" />
+        groups="base.group_extended"
+        parent="base.menu_base_partner" sequence="7" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
         <field name="name">Funds</field>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 8d315c14a6d..a2a104adf15 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -15,6 +15,7 @@
 
     <menuitem action="crm_fund_categ_action"
         id="menu_crm_case_fundraising-act"
+        groups="base.group_extended"
         parent="crm.menu_crm_case_categ" />
 
 <!-- Fund Stage Form View -->
@@ -29,6 +30,7 @@
         </record>
 
         <menuitem action="crm_fundraising_stage_act"
+            groups="base.group_extended"
             id="menu_crm_fundraising_stage_act"
             parent="crm.menu_crm_case_stage" />
 
@@ -44,6 +46,7 @@
         </record>
 
         <menuitem action="crm_fundraising_resource_act"
+            groups="base.group_extended"
             id="menu_crm_fundraising_resource_act"
             parent="crm.menu_crm_case_resource_type" />
 
@@ -78,6 +81,7 @@
                     states="draft,open" type="object" icon="gtk-media-pause" />
                 <button name="case_escalate" string="Escalate"
                     states="open,draft,pending" type="object"
+                    groups="base.group_extended"
                     icon="gtk-go-up" />
                 <button name="case_reset" string="Reset to Draft"
                     states="done,cancel" type="object" icon="gtk-convert" />
@@ -117,7 +121,7 @@
                     <field name="probability"/>
                     <separator colspan="4" string="Categorization"/>
                     <group colspan="4" col="6">
-                        <field name="user_id" select="2" string="Responsible"/>
+                        <field name="user_id" string="Responsible"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
                             widget="selection"
@@ -125,11 +129,11 @@
                         <field name="date"/>
                         <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Details"/>
+                    <separator colspan="4" string="Notes"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="case_close" string="Done"
                             states="open,draft,pending" type="object"
                             icon="gtk-close" />
@@ -144,6 +148,7 @@
                             icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
+                            groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_reset"
                             string="Reset to Draft" states="done,cancel"
@@ -277,7 +282,7 @@
                                domain="[('user_id','=', False)]"
                                help="Unassigned" />
                        </field>
-                       <field name="section_id" select="1" widget="selection" string="Section">
+                       <field name="section_id" select="1" widget="selection" string="Sales Team">
                            <filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section" />
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index bea0c3a894c..dc11b071a4c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -27,7 +27,7 @@
                 <group colspan="4" col="4">
                     <field colspan="4" name="name" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="date_deadline" select="2"/>
+                    <field name="date_deadline"/>
                 </group>
                 <notebook colspan="4">
                     <page string="General">
@@ -38,9 +38,9 @@
                                 select="1" />
                             <field name="partner_address_id"
                                 on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                select="2" />
+                                />
 
-                            <field name="email_from" select="2" />
+                            <field name="email_from" />
                             <button name="remind_partner"
                                 states="open,pending"
                                 string="Send Reminder" type="object"
@@ -58,7 +58,7 @@
                                 icon="gtk-go-forward" />
                         </group>
 
-                        <separator colspan="4" string="Details"/>
+                        <separator colspan="4" string="Notes"/>
                         <field name="description" colspan="4"
                                 nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
@@ -88,9 +88,9 @@
                     </page>
                     <page string="History" groups="base.group_extended">
                         <field name="id" select="1"/>
-                        <field name="active" select="2"/>
-                        <field name="categ_id" select="2"/>
-                        <field name="som" select="2"/>
+                        <field name="active"/>
+                        <field name="categ_id"/>
+                        <field name="som"/>
                         <separator colspan="4" string="Dates"/>
                         <field name="create_date"/>
                         <field name="date_closed"/>
@@ -103,8 +103,8 @@
                             <form string="Actions">
                                 <separator colspan="4" string="Action Information"/>
                                 <field colspan="4" name="name"/>
-                                <field name="date" select="2"/>
-                                <field name="user_id" select="2"/>                                
+                                <field name="date"/>
+                                <field name="user_id"/>                                
                             </form>
                         </field>
                     </page>
@@ -177,6 +177,7 @@
                     states="draft,open" type="object"
                     icon="gtk-media-pause" />
                 <button name="case_escalate" string="Escalate"
+                    groups="base.group_extended"
                     states="open,draft,pending" type="object"
                     icon="gtk-go-up" />
                 <button name="case_reset" string="Reset to Draft"
@@ -226,7 +227,7 @@
                     <filter icon="terp-partner" name="my_hd_request" 
                     domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/>
                 </field>
-                <field name="section_id" select="1" widget="selection" string="Section">
+                <field name="section_id" select="1" widget="selection" string="Sales Team">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
                         help="My section" />
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9b034890fed..546431ac7c7 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -81,7 +81,8 @@ class crm_lead(osv.osv):
                     resource_id = False
                     if lead.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',lead.user_id.id)])
-                        resource_id = len(resource_ids) or resource_ids[0]
+                        if len(resource_ids):
+                            resource_id = resource_ids[0]
 
                     duration = float(ans.days)
                     if lead.section_id.resource_calendar_id:
@@ -122,7 +123,7 @@ class crm_lead(osv.osv):
         'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
 
         'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
+        'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 method=True, multi='day_open', type="integer", store=True),
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 8e34bca3118..d9424b77fc4 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -25,10 +25,11 @@
     </record>
 
     <menuitem id="base.menu_sales" name="Sales"
-    	parent="base.menu_base_partner" sequence="1" />
+        parent="base.menu_base_partner" sequence="1" />
     <menuitem parent="base.menu_sales" name="Leads"
-    	id="menu_crm_case_categ0_act_leads"
-    	action="crm_case_category_act_leads_all" sequence="1" />
+        groups="base.group_extended"
+        id="menu_crm_case_categ0_act_leads"
+        action="crm_case_category_act_leads_all" sequence="1" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9dad22dba81..829372fb30b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,6 +13,7 @@
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
+        groups="base.group_extended"
         parent="crm.menu_crm_case_stage" />
 
     <!--  Resource Type Form View -->
@@ -27,6 +28,7 @@
         </record>
         <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act"
+            groups="base.group_extended"
             parent="crm.menu_crm_case_resource_type" />
 
 <!-- CRM Lead Form View  -->
@@ -42,18 +44,17 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="convert_opportunity"
-                            string="Convert"
-                            help="Convert into Opportunity"
-                            icon="gtk-index"   
-                            type="object"                         
-                            attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+                         name="convert_opportunity"
+                         string="Convert"
+                         help="Convert to Opportunity"
+                         icon="gtk-index"   
+                         type="object"
+                         attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
                         widget="selection" />
                     <field name="user_id" />
                     <field name="stage_id" widget="selection"
-                        readonly="1"
                         domain="[('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
@@ -102,7 +103,7 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="case_close" string="Close"
                             states="open,draft,pending" type="object"
                             icon="gtk-close" />
@@ -117,6 +118,7 @@
                             icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
+                            groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_reset"
                             string="Reset to Draft" states="done,cancel"
@@ -166,9 +168,9 @@
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <button colspan="4"
-                                string="Reply to Email"
+                                string="Reply to Last Email"
                                 name="%(action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead'}"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                 icon="gtk-undo" type="action" />
                         </form>
                         <tree string="Communication history">
@@ -223,9 +225,9 @@
                     states="open,draft,pending" type="object"
                     icon="gtk-close" />
                 <button string="Convert to Opportunity"
-                    name="%(action_crm_lead2opportunity)d"
+                    name="convert_opportunity"
                     states="draft,open,pending" icon="gtk-index"
-                    type="action" />
+                    type="object" />
                 <button name="case_escalate" string="Escalate"
                     states="open,draft,pending" type="object"
                     icon="gtk-go-up" />
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index d76a31136ae..e0b968a1808 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -33,9 +33,7 @@ crm_opportunity()
 
 class crm_phonecall(osv.osv):
     """ CRM Phonecall """
-
     _name = 'crm.phonecall'
-
 crm_phonecall()
 
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 766a0fdf6aa..35415a9d028 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -29,7 +29,9 @@
                         colspan="4" />
                     <field name="categ_id" widget="selection"
                         string="Meeting Type"
+                        groups="base.group_extended"
                         domain="[('object_id.model', '=', 'crm.meeting')]" />
+                    <newline/>
                     <field name="date" string="Start Date" required="1"
                         on_change="onchange_dates(date,duration,False)" />
                     <field name="duration" widget="float_time"
@@ -99,8 +101,9 @@
                     <group col="6" colspan="4">
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Assignment"/>
-                            <field name="section_id" widget="selection" />
                             <field name="user_id" />
+                            <field name="section_id" widget="selection"
+                                groups="base.group_extended"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Contacts"/>
                             <field name="partner_id" string="Partner"
@@ -111,18 +114,18 @@
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
-                            <field name="show_as" string="Show time as"/>
                             <field name="class" string="Privacy"/>
+                            <field name="show_as" string="Show time as" groups="base.group_extended"/>
                             <field name="rrule" groups="base.group_extended" />
-                            <field name="recurrent_id" invisible="1" />
-                            <field name="recurrent_uid" invisible="1" />
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
                         </group>
                     </group>
                     <separator string="Description" colspan="4" />
                     <field name="description" nolabel="1" colspan="4" />
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2" />
+                        <field name="state" />
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
@@ -155,7 +158,7 @@
                                         <field name="role" select="1" />
                                         <separator colspan="4" string="" />
                                         <group col="6" colspan="4">
-                                            <field name="state" select="2" />
+                                            <field name="state" />
                                             <button name="do_tentative"
                                                 states="needs-action,declined,accepted"
                                                 string="Uncertain"
@@ -203,14 +206,12 @@
         <field name="arch" type="xml">
             <tree string="Meetings"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id" widget="char" />
                 <field name="name" string="Subject" />
                 <field name="partner_id" string="Partner" />
-                <field name="section_id" />
                 <field name="date" string="Meeting Date" />
-                <field name="categ_id" />
+                <field name="duration" />
                 <field name="user_id" />
-                <field name="state" />
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ad38f746c51..3e1fc24a803 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -39,7 +39,7 @@ class crm_opportunity(osv.osv):
 
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
-    _order = "priority,id desc"
+    _order = "priority,date_action,id desc"
     _inherit = 'crm.case'
 
     def case_open(self, cr, uid, ids, *args):
@@ -88,7 +88,8 @@ class crm_opportunity(osv.osv):
                     resource_id = False
                     if opportunity.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
-                        resource_id = len(resource_ids) and resource_ids[0] or False
+                        if resource_ids and len(resource_ids):
+                            resource_id = resource_ids[0]
 
                     duration = float(ans.days)
                     if opportunity.section_id.resource_calendar_id:
@@ -118,9 +119,8 @@ class crm_opportunity(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                      domain="[('section_id','=',section_id), \
                     ('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Resource Type',\
-                    domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'referred': fields.char('Referred By', size=64),
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Expected Revenue'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
@@ -129,6 +129,7 @@ class crm_opportunity(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman'),
         'phone': fields.char("Phone", size=64),
         'date_deadline': fields.date('Expected Closing'),
+        'date_action': fields.date('Next Action'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index e88e0f1ec8e..b893d536e44 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -18,7 +18,6 @@
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_oppor3"/>
             <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
@@ -34,7 +33,6 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="50" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor1"/>
             <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
@@ -51,7 +49,6 @@
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
             <field name="stage_id" ref="crm.stage_oppor5"/>
             <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
@@ -68,7 +65,6 @@
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor4"/>
             <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
@@ -84,7 +80,6 @@
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_oppor6"/>
             <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 92b09919791..b7019885a4a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -79,6 +79,10 @@
                     <field name="date_deadline" string="Expected Closing"/>
                     <button string="Schedule Call"
                         name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
+
+                    <newline/>
+                    <field name="date_action"/>
+                    <field name="priority" string="Priority"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
@@ -94,9 +98,7 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Categorization"/>
-                        <field name="type_id" select="1" string="Campaign" groups="base.group_extended"/>
                         <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="priority" string="Priority"/>
                         <field name="categ_id" select="1"
                             string="Category" widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -107,12 +109,13 @@
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
+                            groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_pending" string="Pending"
                             states="draft,open" type="object"
@@ -142,6 +145,7 @@
                         <field name="active"/>
                         <field name="day_open"/>
                         <field name="day_close"/>
+                        <field name="referred"/>
                     </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref"/>
@@ -207,7 +211,6 @@
                 <field name="partner_id"/>
                 <field name="stage_id"/>
                 <field name="categ_id" invisible="1"/>
-                <field name="type_id" invisible="1"/>
                 <button name="stage_previous" string="Previous"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
@@ -215,7 +218,7 @@
                     icon="gtk-go-forward" />
                 <field name="planned_revenue" sum="Expected Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="date_deadline" string="Expected Closing"/>
+                <field name="date_action"/>
                 <field name="section_id"/>
                 <field name="user_id"/>
                 <field name="priority"/>
@@ -304,8 +307,6 @@
                     <filter string="Category" icon="terp-crm"
                         domain="[]" context="{'group_by':'categ_id'}" />
 
-                    <filter string="Campaign" icon="terp-crm"
-                        domain="[]" context="{'group_by':'type_id'}" />
                     <separator orientation="vertical" />
                     <filter string="Partner" icon="terp-crm" domain="[]"
                         context="{'group_by':'partner_id'}" />
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 9e6678c0834..8f5e66564f8 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -46,7 +46,8 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-    	parent="base.menu_base_partner" sequence="5" />
+        groups="base.group_extended"
+        parent="base.menu_base_partner" sequence="5" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
@@ -81,8 +82,8 @@
     </record>
 
     <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
-    	parent="crm.menu_crm_case_phone"
-    	action="crm_case_categ_phone_incoming0" />
+        parent="crm.menu_crm_case_phone"
+        action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
         <field name="name">Outbound</field>
@@ -117,8 +118,8 @@
     </record>
 
     <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
-    	parent="crm.menu_crm_case_phone"
-    	action="crm_case_categ_phone_outgoing0" />
+        parent="crm.menu_crm_case_phone"
+        action="crm_case_categ_phone_outgoing0" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 064d3569d03..dfa949ad0b7 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -184,7 +184,7 @@
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-                   select="1" widget="selection" string="Section">
+                   select="1" widget="selection" string="Sales Team">
                    <filter icon="terp-crm"
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My section" />
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 33a2cdad479..9535992ab6a 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -5,7 +5,7 @@
 <!--  Cases by section and category2 of case Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
-        <field name="name">CRM Report - Sections and Type(Tree)</field>
+        <field name="name">CRM Report - Teams and Type(Tree)</field>
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
@@ -27,7 +27,7 @@
 <!--  Cases by section and category2 of case Form View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_form">
-        <field name="name">CRM Report - Sections and Type(Form)</field>
+        <field name="name">CRM Report - Teams and Type(Form)</field>
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 356597fe10e..0d4bb763556 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
+        <menuitem id="menu_crm_configuration" name="Cases"
+            parent="base.menu_base_config" sequence="0"/>
 
 <!-- Case Sections Form View -->
 
@@ -295,6 +296,7 @@
                         icon="gtk-media-pause" />
                     <button name="case_escalate"
                         states="open,draft,pending" string="Escalate"
+                        groups="base.group_extended"
                         type="object" icon="gtk-go-up" />
                     <button name="case_reset" states="done,cancel"
                         string="Reset to Draft" type="object"
@@ -315,7 +317,7 @@
                     <field colspan="4" name="name" select="1"/>
                     <field colspan="2" name="section_id" widget="selection"/>
                     <field name="create_date" select="1"/>
-                    <field name="date_deadline" select="2"/>
+                    <field name="date_deadline"/>
                     <newline />
                     <notebook colspan="4">
                         <page string="General">
@@ -326,10 +328,10 @@
                                 <field colspan="3"
                                     name="partner_address_id"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                    select="2" />
+                                    />
                                 <newline />
                                 <field colspan="3" name="email_from"
-                                    select="2" />
+                                    />
                                 <button name="remind_partner"
                                     states="open,pending"
                                     string="Send Reminder" type="object"
@@ -362,6 +364,7 @@
                                 <button name="case_escalate"
                                     states="open,draft,pending"
                                     string="Escalate" type="object"
+                                    groups="base.group_extended"
                                     icon="gtk-go-up" />
                                 <button name="case_reset"
                                     states="done,cancel"
@@ -371,15 +374,15 @@
                         </page>
                         <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <separator colspan="4" string="Dates"/>
                             <field name="create_date"/>
                             <field colspan="4" name="log_ids" nolabel="1">
                                 <form string="Actions">
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
-                                    <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
                                 </form>
                             </field>
                         </page>
@@ -500,11 +503,11 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="date" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="model_id" select="2"/>
-                    <field name="res_id" select="2"/>
-                    <field name="som" select="2"/>
-                    <field name="canal_id" select="2"/>
-                    <field colspan="4" name="description" select="2"/>
+                    <field name="model_id"/>
+                    <field name="res_id"/>
+                    <field name="som"/>
+                    <field name="canal_id"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
@@ -569,9 +572,9 @@
                 <form string="Partner Segmentation Lines">
                     <field colspan="4" name="name" select="1"/>
                     <group col="2" colspan="4">
-                        <field name="expr_name" select="2"/>
-                        <field name="expr_operator" select="2"/>
-                        <field name="expr_value" select="2"/>
+                        <field name="expr_name"/>
+                        <field name="expr_operator"/>
+                        <field name="expr_value"/>
                     </group>
                     <newline/>
                     <field name="operator"/>
@@ -589,7 +592,7 @@
                 <form string="Partner Segmentation">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="categ_id" select="2"/>
+                        <field name="categ_id"/>
                         <field name="exclusif"/>
                     </group>
                     <notebook colspan="4">
@@ -604,7 +607,7 @@
                             <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
                         </page>
                         <page string="Description">
-                               <field colspan="4" name="description" select="2" nolabel="1"/>
+                               <field colspan="4" name="description" nolabel="1"/>
                            </page>
                     </notebook>
                     <field name="state"/>
@@ -654,6 +657,7 @@
         </record>
         <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
+            groups="base.group_extended"
             parent="crm.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
@@ -678,7 +682,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="password" position="after">
-                    <field name="context_section_id" completion="1" widget="selection"/>
+                        <field name="context_section_id" completion="1" widget="selection"/>
                     </field>
                 </field>
         </record>
@@ -693,7 +697,8 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="parent_id" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
@@ -706,7 +711,8 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="lang" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
@@ -719,7 +725,8 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="category_id" position="after">
-                        <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 465fab740a6..4d544c97711 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -10,17 +10,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Claims">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id" />
                     <field name="partner_id" />
-					<field name="nbr" string="#Claim"/>
-	                <field name="delay_close"/>
-	                <field name="state"  invisible="1"/>
-	                <field name="stage_id" invisible="1"/>
-	                <field name="categ_id" invisible="1"/>
+                    <field name="nbr" string="#Claim"/>
+                    <field name="delay_close"/>
+                    <field name="state"  invisible="1"/>
+                    <field name="stage_id" invisible="1"/>
+                    <field name="categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
@@ -67,10 +67,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
              <xpath
-             	expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-             	position='after'>
-             	<filter string="Stage" icon="terp-sale" domain="[]"
-             		context="{'group_by':'stage_id'}" />
+                 expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                 position='after'>
+                 <filter string="Stage" icon="terp-sale" domain="[]"
+                     context="{'group_by':'stage_id'}" />
              </xpath>
             </field>
         </record>
@@ -81,29 +81,30 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
-  			<field name="view_mode">tree,graph</field>
+              <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
 
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_claim_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_claim"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_claim_tree"/>
+            <field name="act_window_id" ref="action_report_crm_claim"/>
+        </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_claim_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_claim"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_claim_graph"/>
+            <field name="act_window_id" ref="action_report_crm_claim"/>
+        </record>
 
-       	<menuitem name="Claims" id="menu_report_crm_claim_tree"
-       		action="action_report_crm_claim" parent="base.next_id_64" />
+       <menuitem name="Claims" id="menu_report_crm_claim_tree"
+           groups="base.group_extended"
+           action="action_report_crm_claim" parent="base.next_id_64" />
 
 
     </data>
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index fbc56e6202e..c051ab8dcb8 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -9,14 +9,14 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Fundraising">
-	              	<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                <tree string="Fundraising">
+                      <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
-    				<field name="company_id" />
+                    <field name="company_id" />
                     <field name="partner_id" />
-                	<field name="nbr" string="#Fundraising"/>
+                    <field name="nbr" string="#Fundraising"/>
                     <field name="amount_revenue"  sum="Total Revenue"/>
                     <field name="probability"/>
                     <field name="amount_revenue_prob"/>
@@ -36,7 +36,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -85,23 +85,24 @@
         </record>
 
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_fundraising_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_fundraising"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_fundraising_tree"/>
+            <field name="act_window_id" ref="action_report_crm_fundraising"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_fundraising_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_fundraising"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_fundraising_graph"/>
+            <field name="act_window_id" ref="action_report_crm_fundraising"/>
+        </record>
 
         <menuitem name="Fundraising"
-        	action="action_report_crm_fundraising"
-        	id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
+            action="action_report_crm_fundraising"
+            groups="base.group_extended"
+            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index ba4e3be7ed2..0852d343c95 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -10,18 +10,18 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Helpdesk">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id"/>
                     <field name="partner_id" />
                     <field name="date_deadline" invisible="1"/>
                     <field name="priority" invisible="1"/>
-					<field name="nbr" string="#Helpdesk" />
-	                <field name="delay_close"/>
+                    <field name="nbr" string="#Helpdesk" />
+                    <field name="delay_close"/>
                     <field name="state" invisible="1"/>
-				</tree>
+                </tree>
             </field>
         </record>
 
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -59,46 +59,46 @@
 
 <!-- Helpdesk report after Sales Services Search View -->
 
-		<record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
+        <record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.select</field>
             <field name="model">crm.helpdesk.report</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			name="this_year" />
+                           <filter string="This Year" icon="terp-hr"
+                               domain="[('name','=',time.localtime()[0])]"
+                               name="this_year" />
 
-                   		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]"
-                   			name="this_month" />
+                           <filter string="This Month" icon="terp-hr"
+                               domain="[('month','=',time.strftime('%%m'))]"
+                               name="this_month" />
 
-                   		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-hr"
-                   			domain="[('state','in',('open','draft'))]" />
+                           <separator orientation="vertical" />
+                           <filter string="Current" icon="terp-hr"
+                               domain="[('state','in',('open','draft'))]" />
 
-                   		<filter string="Won" icon="terp-hr"
-                   			domain="[('state','=','done')]" />
+                           <filter string="Won" icon="terp-hr"
+                               domain="[('state','=','done')]" />
 
-                   		<filter string="Lost" icon="terp-hr"
-                   			domain="[('state','=','cancel')]" />
+                           <filter string="Lost" icon="terp-hr"
+                               domain="[('state','=','cancel')]" />
 
-                   		<filter string="Deadline" icon="terp-hr"
-                   			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
+                           <filter string="Deadline" icon="terp-hr"
+                               domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
 
-                   		<separator orientation="vertical" />
-                   		<field name="section_id"
-                   			widget="selection"
-                   			context="{'invisible_section': False}">
+                           <separator orientation="vertical" />
+                           <field name="section_id"
+                               widget="selection"
+                               context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                               <filter icon="terp-crm"
+                                   context="{'invisible_section': False}"
+                                   domain="[('section_id.user_id','=',uid)]"
+                                   help="My section" />
 
-                   		</field>
-                   		<field name="company_id" widget="selection">
+                           </field>
+                           <field name="company_id" widget="selection">
 
                            <filter icon="terp-crm"
                         context="{'invisible_section': False}"
@@ -111,24 +111,24 @@
                    <newline/>
                    <group expand="1" string="Extended options..." colspan="4" col="5">
                         <filter icon="terp-sale"
-                    		string="Lowest"
-                    		domain="[('priority','=','5')]"/>
+                            string="Lowest"
+                            domain="[('priority','=','5')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="Low"
-                    		domain="[('priority','=','4')]"/>
+                        <filter icon="terp-sale"
+                            string="Low"
+                            domain="[('priority','=','4')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="Normal"
-                    		domain="[('priority','=','3')]"/>
+                        <filter icon="terp-sale"
+                            string="Normal"
+                            domain="[('priority','=','3')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="High"
-                    		domain="[('priority','=','2')]"/>
+                        <filter icon="terp-sale"
+                            string="High"
+                            domain="[('priority','=','2')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="Highest"
-                    		domain="[('priority','=','1')]"/>
+                        <filter icon="terp-sale"
+                            string="Highest"
+                            domain="[('priority','=','1')]"/>
 
                    </group>
                    <newline/>
@@ -137,30 +137,30 @@
 
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
 
                         <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
 
                         <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
+                            domain="[]" context="{'group_by':'state'}" />
 
                         <filter string="Partner" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'partner_id'}" />
+                            domain="[]"
+                            context="{'group_by':'partner_id'}" />
 
                         <separator orientation="vertical" />
                         <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" />
 
                         <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                </search>
@@ -179,22 +179,23 @@
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
+            <field name="act_window_id" ref="action_report_crm_helpdesk"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_helpdesk_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_helpdesk_graph"/>
+            <field name="act_window_id" ref="action_report_crm_helpdesk"/>
+        </record>
 
         <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
-        	id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
+            groups="base.group_extended"
+            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 58d69699404..30c1ab2135c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,16 +10,16 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads">
-				<field name="name" />
-				<field name="month"/>
-				<field name="section_id" />
-				<field name="user_id" />
-    			<field name="company_id" />
-				<field name="partner_id" />
-				<field name="nbr" string="#Leads"/>
+                <field name="name" />
+                <field name="month"/>
+                <field name="section_id" />
+                <field name="user_id" />
+                <field name="company_id" />
+                <field name="partner_id" />
+                <field name="nbr" string="#Leads"/>
                 <field name="delay_close"/>
                 <field name="state"  invisible="1"/>
-				<field name="stage_id"  invisible="1"/>
+                <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
              </tree>
             </field>
@@ -34,8 +34,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
-                	<field name="stage_id"/>
+                    <field name="delay_close"/>
+                    <field name="stage_id"/>
                 </field>
             </field>
         </record>
@@ -63,12 +63,12 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-			<xpath
-				expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-				position='after'>
-				<filter string="Stage" icon="terp-sale" domain="[]"
-					context="{'group_by':'stage_id'}" />
-			</xpath>
+            <xpath
+                expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                position='after'>
+                <filter string="Stage" icon="terp-sale" domain="[]"
+                    context="{'group_by':'stage_id'}" />
+            </xpath>
             </field>
         </record>
 
@@ -84,22 +84,23 @@
 
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_lead_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_lead_tree"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_lead_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_graph"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
-       	<menuitem name="Leads" id="menu_report_crm_leads_tree"
-       		parent="base.next_id_64" action="action_report_crm_lead" />
+       <menuitem name="Leads" id="menu_report_crm_leads_tree"
+           groups="base.group_extended"
+           parent="base.next_id_64" action="action_report_crm_lead" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 560cfe17fd9..36dec45ddf7 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -32,7 +32,8 @@ class crm_opportunity_report(osv.osv):
         'probability': fields.float('Avg. Probability', readonly=True, group_operator="avg"),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),
         'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
-        'delay_close': fields.float('Delay to close', digits=(16,2), readonly=True, group_operator="avg"),
+        'delay_close': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
+            help="Number of Days to close the opportunities"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                      domain="[('section_id','=',section_id),\
                     ('object_id.model', '=', 'crm.opportunity')]", readonly=True),
@@ -70,7 +71,7 @@ class crm_opportunity_report(osv.osv):
                     sum(planned_revenue) as amount_revenue,
                     sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
-                    avg(extract('epoch' from (date_closed-c.create_date)))/3600 as delay_close
+                    avg(extract('epoch' from (date_closed-c.create_date)))/(3600*24) as delay_close
                 from
                     crm_opportunity c
                 group by
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 8cd174843a7..58768ebceef 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -20,7 +20,7 @@
                     <field name="amount_revenue"  sum="Total Revenue"/>
                     <field name="probability" widget="progressbar"/>
                     <field name="amount_revenue_prob"/>
-                    <field name="delay_close" widget="float_time"/>
+                    <field name="delay_close"/>
                     <field name="state" invisible="1"/>
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a78d94977f8..e937ef6bd22 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -10,17 +10,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Phone calls">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id"/>
                     <field name="partner_id" />
-					<field name="nbr" string="#Phone calls" />
-	                <field name="delay_close"/>
+                    <field name="nbr" string="#Phone calls" />
+                    <field name="delay_close"/>
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
-				</tree>
+                </tree>
             </field>
         </record>
 
@@ -33,7 +33,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -81,23 +81,24 @@
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_phonecall_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_phonecall_tree"/>
+            <field name="act_window_id" ref="action_report_crm_phonecall"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_phonecall_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_phonecall_graph"/>
+            <field name="act_window_id" ref="action_report_crm_phonecall"/>
+        </record>
 
         <menuitem name="Phone Calls"
-        	action="action_report_crm_phonecall"
-        	id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
+            action="action_report_crm_phonecall"
+            groups="base.group_extended"
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 6d96016b8ae..f4b97ad2f14 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -77,6 +77,7 @@ class crm_lead2opportunity(osv.osv_memory):
             for this in self.browse(cr, uid, ids, context=context):
                 new_opportunity_id = opp_obj.create(cr, uid, {
                         'name': this.name, 
+                        'referred': this.referred,
                         'planned_revenue': this.planned_revenue, 
                         'probability': this.probability, 
                         'partner_id': lead.partner_id and lead.partner_id.id or False , 
@@ -89,7 +90,6 @@ class crm_lead2opportunity(osv.osv_memory):
                         'phone': lead.phone, 
                         'email_from': lead.email_from
                     })
-
                 new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
                 vals = {
                         'partner_id': this.partner_id and this.partner_id.id or False, 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index eefd438c368..229b54e09fe 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,61 +1,63 @@
 <openerp>
-  	<data>
+      <data>
 
-		<!-- Lead to Opportunity view -->
+        <!-- Lead to Opportunity view -->
 
-  		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
-	      <field name="name">crm.lead2opportunity.create</field>
-	      <field name="model">crm.lead2opportunity</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Convert To Opportunity">
-		        <field name="name"/>
-		        <field name="partner_id"/>
-		        <newline/>
-		        <field name="planned_revenue"/>
-		        <field name="probability"/>
-		        <group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
-	      		</group>
-		    </form>
-	      </field>
-	   </record>
-	   
-	   <!-- Lead to Opportunity action -->
-	   
-	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
-	      <field name="name">Create Opportunity</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.lead2opportunity</field>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	   </record>
+          <record id="view_crm_lead2opportunity_create" model="ir.ui.view">
+          <field name="name">crm.lead2opportunity.create</field>
+          <field name="model">crm.lead2opportunity</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Convert To Opportunity">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <newline/>
+                <field name="planned_revenue"/>
+                <field name="probability"/>
+                <separator colspan="4"/>
+                <group col="4" colspan="4">
+                    <label string="" colspan="2"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
+          </field>
+       </record>
+       
+       <!-- Lead to Opportunity action -->
+       
+       <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
+          <field name="name">Create Opportunity</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">crm.lead2opportunity</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+       </record>
 
 
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
-	      <field name="name">crm.lead2opportunity.partner.form</field>
-	      <field name="model">crm.lead2opportunity.partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	 <form string="Create a Partner">
+          <field name="name">crm.lead2opportunity.partner.form</field>
+          <field name="model">crm.lead2opportunity.partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+               <form string="Create a Partner">
                 <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
                 <label string="You may have to verify that this partner does not exist already." colspan="4"/>
                 <newline />
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
-		        </group>
-		        <separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
-	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
+                <field name="action"/>
+                <group attrs="{'invisible':[('action','!=','exist')]}">
+                    <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                </group>
+                <separator string="" colspan="4" />
+                <group col="4" colspan="4">
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                </group>
             </form>
-	      </field>
-	   </record> 
+          </field>
+       </record> 
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 2cd0ab541fe..267c3296844 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -53,42 +53,41 @@ class crm_lead2partner(osv.osv_memory):
                      raise osv.except_osv(_('Warning !'),
                         _('A partner is already defined on this lead.'))
 
-    def _select_partner(self, cr, uid, context=None):
+    def default_get(self, cr, uid, fields, context=None):
         """
-        This function Searches for Partner from selected lead.
+        This function gets default values
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
 
-        @return : Partner id if any for selected lead.
+        @return : default values of fields.
         """
-        if not context:
-            context = {}
-
         lead_obj = self.pool.get('crm.lead')
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('active_ids', [])
         partner_id = False
 
-        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+        data = context and context.get('active_ids', []) or []
+        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
+
+        for lead in lead_obj.browse(cr, uid, data, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
             if not partner_ids and lead.email_from:
                 address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
                 if address_ids:
                     addresses = contact_obj.browse(cr, uid, address_ids)
                     partner_ids = addresses and [addresses[0].partner_id.id] or False
-
             partner_id = partner_ids and partner_ids[0] or False
-        return partner_id
-
-    _defaults = {
-        'action': lambda *a:'exist',
-        'partner_id': _select_partner
-        }
 
+            if 'partner_id' in fields:
+                res.update({'partner_id': partner_id})
+            if 'action' in fields:
+                res.update({'action': partner_id and 'exist' or 'create'})
+        return res
+    
     def open_create_partner(self, cr, uid, ids, context=None):
         """
         This function Opens form of create partner.
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index be53b457c12..434035cd2df 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -70,8 +70,8 @@ class crm_send_new_email(osv.osv_memory):
 
         for data in self.read(cr, uid, ids, context=context):
             attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
-            attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-
+            attach = map(lambda x: (data['doc' + str(attach.index(x) + 1) \
+                            + '_fname'], base64.decodestring(x)), attach)
             message_id = None            
             
             case = case_pool.browse(cr, uid, res_id)
@@ -177,6 +177,8 @@ class crm_send_new_email(osv.osv_memory):
         """
         hist_obj = self.pool.get('crm.case.history')
         res_ids = context and context.get('active_ids', []) or []
+
+        include_original = context and context.get('include_original', False) or False
         res = {}
         for hist in hist_obj.browse(cr, uid, res_ids):
             model = hist.log_id.model_id.model
@@ -188,7 +190,8 @@ class crm_send_new_email(osv.osv_memory):
                 res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
-            if 'text' in fields:
+
+            if include_original == True and 'text' in fields:
                 header = '-------- Original Message --------'
                 sender = 'From: %s' %(hist.email_from or '')
                 to = 'To: %s' % (hist.email_to or '')
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__openerp__.py
similarity index 100%
rename from addons/crm_caldav/__terp__.py
rename to addons/crm_caldav/__openerp__.py
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__openerp__.py
similarity index 100%
rename from addons/crm_profiling/__terp__.py
rename to addons/crm_profiling/__openerp__.py
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 9100aa1fd7f..da91dcd7107 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -161,9 +161,9 @@
                     <field name="name" select="1"/>
                     <field name="exclusif"/>
                     <newline/>
-                    <field name="categ_id" select="2" colspan="2"/>
+                    <field name="categ_id" colspan="2"/>
                     <newline/>
-                    <field name="description" select="2" colspan="4"/>
+                    <field name="description" colspan="4"/>
                     <field name="state"/>
                     <group col="3" colspan="2">
                         <button name="process_start"
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index 8449e6dd2b3..10fd9676dae 100644
--- a/addons/crm_profiling/i18n/ko.po
+++ b/addons/crm_profiling/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/decimal_precision/__terp__.py b/addons/decimal_precision/__openerp__.py
similarity index 100%
rename from addons/decimal_precision/__terp__.py
rename to addons/decimal_precision/__openerp__.py
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__openerp__.py
similarity index 100%
rename from addons/delivery/__terp__.py
rename to addons/delivery/__openerp__.py
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 9fee814d900..16f4a61ed1e 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -124,10 +124,10 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <separator string="Notes" position="before">
+                <group name="logistic" position="inside">
                     <field name="id" invisible="True"/>
                     <field name="carrier_id" context="{'order_id':id}"/>
-                </separator>
+                </group>
             </field>
         </record>
 
diff --git a/addons/document/__terp__.py b/addons/document/__openerp__.py
similarity index 100%
rename from addons/document/__terp__.py
rename to addons/document/__openerp__.py
diff --git a/addons/document/document.py b/addons/document/document.py
index f6cbddebae7..2b2ac2f7587 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -73,7 +73,7 @@ class document_file(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'Owner', select=1),
-        'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
+        'group_ids': fields.many2many('res.groups', 'document_group_rel', 'item_id', 'group_id', 'Groups'),
         # the directory id now is mandatory. It can still be computed automatically.
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'file_size': fields.integer('File Size', required=True),
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 270f2d9353f..c9c124cdfe0 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -52,7 +52,7 @@ class document_directory(osv.osv):
         'ressource_type_id': fields.many2one('ir.model', 'Directories Mapped to Objects',
             help="Select an object here and Open ERP will create a mapping for each of these " \
                  "objects, using the given domain, when browsing through FTP."),
-        'resource_field': fields.char('Name field',size=32,help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
+        'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
         'ressource_parent_type_id': fields.many2one('ir.model', 'Parent Model',
             help="If you put an object here, this directory template will appear bellow all of these objects. " \
                  "Don't put a parent directory if you select a parent model."),
@@ -61,10 +61,12 @@ class document_directory(osv.osv):
             help="Check this if you want to use the same tree structure as the object selected in the system."),
         'dctx_ids': fields.one2many('document.directory.dctx', 'dir_id', 'Context fields'),
     }
+
+
     def _get_root_directory(self, cr,uid, context=None):
         objid=self.pool.get('ir.model.data')
         try:
-            mid = objid._get_id(cr, uid, 'document', 'dir_root')            
+            mid = objid._get_id(cr, uid, 'document', 'dir_root')
             if not mid:
                 return False
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index bea11d6d12e..421c423b900 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -103,7 +103,7 @@ class document_storage(osv.osv):
         'create_date': fields.datetime('Date Created', readonly=True),
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
         'user_id': fields.many2one('res.users', 'Owner'),
-        'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
+        'group_ids': fields.many2many('res.groups', 'document_storage_group_rel', 'item_id', 'group_id', 'Groups'),
         'dir_ids': fields.one2many('document.directory', 'parent_id', 'Directories'),
         'type': fields.selection([('db', 'Database'), ('filestore', 'Internal File storage'),
             ('realstore', 'External file storage'), ('virtual', 'Virtual storage')], 'Type', required=True),
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 27297d3b2a8..0185f9fe444 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -13,12 +13,16 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Storage Media">
-                <field name="name" select="1" colspan="4"/>
-                <field name="user_id"/>
-                <field name="type" />
-                <field name="online" />
-                <field name="readonly" />
-                <field name="path" />
+            	<group colspan="4" col="4">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="user_id"/>
+	                <field name="type"/>
+	                <field name="online"/>
+	                <field name="readonly"/>
+                </group>
+                <group colspan="2" attrs="{'invisible':[('type','!=','realstore')]}">
+                	<field name="path"/>
+                </group>
             </form>
         </field>
     </record>
@@ -67,13 +71,13 @@
                     <newline/>
                     <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
                     <field name="ressource_tree"/>
-                    <field name="resource_field"/>
+					<field name="resource_field" 	domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
                     <field name="ressource_id" select="2" readonly="1"/>
                     <field name="ressource_parent_type_id"/>
                 </page>
                 <page string="Generated Files">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
-                    <field name="content_ids" nolabel="1" colspan="4">
+					<field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
                         <form string="Contents">
                             <field name="name"/>
                             <field name="sequence"/>
@@ -179,7 +183,7 @@
                     <field name="title" select="1"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="parent_id" select="2"/>
+                    <field name="parent_id"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
@@ -190,7 +194,7 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Attached To" colspan="2"/>
-                        <field name="res_model" select="2" readonly="1"/>
+                        <field name="res_model" readonly="1"/>
                         <field name="res_id" readonly="1"/>
                     </group>
                     <separator string="Preview" colspan="4"/>
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index c7eb80c0a45..f0342fcb885 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -320,7 +320,7 @@ class node_res_dir(node_class):
         self.content_length = 0
         self.res_model = dirr.ressource_type_id and dirr.ressource_type_id.model or False
         self.resm_id = dirr.ressource_id
-        self.namefield = dirr.resource_field or 'name'
+        self.namefield = dirr.resource_field.name or 'name'
         self.displayname = dirr.name
         # Important: the domain is evaluated using the *parent* dctx!        
         self.domain = dirr.domain
@@ -508,7 +508,7 @@ class node_res_obj(node_class):
                 where1 = where + [(obj._parent_name, '=', self.res_id)]
             resids = obj.search(cr,uid, where1, context=ctx)                        
             for bo in obj.browse(cr,uid,resids,context=ctx):
-                namefield = directory.resource_field or 'name'
+                namefield = directory.resource_field.name or 'name'
                 if not bo:
                     continue
                 res_name = getattr(bo, namefield)
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index d44694361b6..4979c05a17d 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -23,7 +23,6 @@ import StringIO
 import odt2txt
 from subprocess import Popen, PIPE
 from content_index import indexer, cntIndex
-from subprocess import Popen, PIPE
 
 def _to_unicode(s):
     try:
diff --git a/addons/document_ftp/__terp__.py b/addons/document_ftp/__openerp__.py
similarity index 100%
rename from addons/document_ftp/__terp__.py
rename to addons/document_ftp/__openerp__.py
diff --git a/addons/document_ics/__terp__.py b/addons/document_ics/__openerp__.py
similarity index 100%
rename from addons/document_ics/__terp__.py
rename to addons/document_ics/__openerp__.py
diff --git a/addons/document_webdav/__terp__.py b/addons/document_webdav/__openerp__.py
similarity index 100%
rename from addons/document_webdav/__terp__.py
rename to addons/document_webdav/__openerp__.py
diff --git a/addons/fetchmail/__terp__.py b/addons/fetchmail/__openerp__.py
similarity index 100%
rename from addons/fetchmail/__terp__.py
rename to addons/fetchmail/__openerp__.py
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__openerp__.py
similarity index 100%
rename from addons/google_map/__terp__.py
rename to addons/google_map/__openerp__.py
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 813d9d83fa4..6c33f3fe258 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 7f16f55dce8..1d0be1f288e 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -313,11 +313,13 @@ class hr_evaluation_interview(osv.osv):
         """
         if not context:
             context = {}
+
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
         context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,})
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
         return value            
+
 hr_evaluation_interview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 11348ccd1f3..4e1e3033a92 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -175,9 +175,8 @@ hr_expense_expense()
 
 class product_product(osv.osv):
     _inherit = "product.product"
-
     _columns = {
-        'hr_expense_ok': fields.boolean('Can constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+        'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
     }
 
 product_product()
@@ -234,4 +233,4 @@ class hr_expense_line(osv.osv):
 
 hr_expense_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cd07d8d4fe8..92e4acd7f63 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -282,10 +282,10 @@
             <field name="arch" type="xml">
                 <form string="Leave Type">
                     <field colspan="4" name="name" select="1"/>
-                    <field name="limit" select="2"/>
-                    <field name="active" select="2"/>
+                    <field name="limit"/>
+                    <field name="active"/>
                     <field name="categ_id"  select="1" widget="selection"/>
-                    <field name="color_name" select="2"/>
+                    <field name="color_name"/>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index a32e3027bba..244668ec719 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -19,11 +19,10 @@
 		 action="holidays_summary"
 		 type="wizard"
 		 id="menu_holidays_summary" sequence="20"/>
--->
-	 <!-- restrict menu access to HR Manager -->
 	 <record model='ir.ui.menu' id="menu_holidays_summary">
 		 <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
   	 </record>
+-->
 
 	<!--<wizard string="Employee's Holidays"
 		model="hr.employee" name="hr.holidays.summary.employee"
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 8cb7dd0924b..6fe8b91aa3e 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -163,7 +163,6 @@ class hr_applicant(osv.osv):
         """
         if not context:
             context = {}
-
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
         context.update({'survey_id': record.survey.id, 'response_id' : [record.response], 'response_no':0,})
@@ -179,4 +178,4 @@ class hr_job(osv.osv):
         'survey_id': fields.many2one('survey', 'Survey'),
     }
 
-hr_job()
+hr_job()
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d8f318d148b..6c52c99d081 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -27,7 +27,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines">
-                    <field colspan="4" name="name" select="2"/>
+                    <field colspan="4" name="name"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
                     <field name="date" select="1" on_change="on_change_date(date)"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
@@ -36,8 +36,8 @@
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
 
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
-                    <field name="amount" select="2"/>
-                    <field name="general_account_id" select="2"/>
+                    <field name="amount"/>
+                    <field name="general_account_id"/>
                     <field name="journal_id"/>
                 </form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index ac575a625e4..7e5edca5474 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -193,7 +193,7 @@ class invoice_create(wizard.interface):
     _create_form = """<?xml version="1.0"?>
     <form string="Invoice on analytic entries">
         <notebook>
-        <page string="Invoicing Data">
+        <page string="Billing Data">
             <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
             <field name="date"/>
             <field name="time"/>
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 9e2d87c55c3..9db13474ee0 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -144,7 +144,7 @@
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoicing&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Billing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
@@ -185,4 +185,4 @@
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/html_view/__terp__.py b/addons/html_view/__openerp__.py
similarity index 100%
rename from addons/html_view/__terp__.py
rename to addons/html_view/__openerp__.py
diff --git a/addons/idea/__terp__.py b/addons/idea/__openerp__.py
similarity index 100%
rename from addons/idea/__terp__.py
rename to addons/idea/__openerp__.py
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index f76dd1aa562..c5e6c530334 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class idea_post_vote(osv.osv_memory):
     """ Post Vote For Idea """
@@ -35,6 +36,27 @@ class idea_post_vote(osv.osv_memory):
                                           ('75', 'Good'),
                                           ('100', 'Very Good') ], 'Post Vote', required=True)
                 }
+    
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+        """
+        idea_obj = self.pool.get('idea.idea')
+
+        for idea in idea_obj.browse(cr, uid, context.get('active_ids', [])):
+            if idea.state in ['draft', 'close', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Draft/Accepted/Cancelled \
+ideas Could not be voted"))
+            if idea.state != 'open':
+                raise osv.except_osv(_('Warning !'), _('idea should be in \
+\'Open\' state before vote for that idea.'))
+        return False
+
 
     def do_vote(self, cr, uid, ids, context):
 
@@ -52,6 +74,7 @@ class idea_post_vote(osv.osv_memory):
         for do_vote_obj in self.read(cr, uid, ids):
             score = str(do_vote_obj['vote'])
             dic = {'idea_id': data, 'user_id': uid, 'score': score }
+            
             vote = vote_obj.create(cr, uid, dic)
             return {}
 
diff --git a/addons/knowledge/__terp__.py b/addons/knowledge/__openerp__.py
similarity index 100%
rename from addons/knowledge/__terp__.py
rename to addons/knowledge/__openerp__.py
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__openerp__.py
similarity index 100%
rename from addons/l10n_be/__terp__.py
rename to addons/l10n_be/__openerp__.py
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 317effd19b7..0e691260425 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -4,6 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="restart">onskip</field>
     </record>
 
     </data>
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__openerp__.py
similarity index 100%
rename from addons/l10n_ch/__terp__.py
rename to addons/l10n_ch/__openerp__.py
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index ddce598627c..e6602e686f8 100755
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -23,7 +23,7 @@
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
                 <field name="partner_bank" position="replace">
-                    <field name="partner_bank" select="2"
+                    <field name="partner_bank"
                         domain="[('partner_id', '=', partner_id)]"
                         on_change="onchange_partner_bank(partner_bank)"/>
                 </field>
@@ -36,10 +36,10 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_bank" position="replace">
-                    <field name="partner_bank" select="2"
+                    <field name="partner_bank"
                         domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 </field>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index 3636cc971a1..aa5d6c20080 100755
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -42,6 +42,7 @@
         <record id="action_config_journal_todo" model="ir.actions.todo">
           <field name="action_id" ref="action_config_journal"/>
           <field name="sequence">5</field>
+          <field name="restart">onskip</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch_chart_c2c_pcg/__terp__.py b/addons/l10n_ch_chart_c2c_pcg/__openerp__.py
similarity index 100%
rename from addons/l10n_ch_chart_c2c_pcg/__terp__.py
rename to addons/l10n_ch_chart_c2c_pcg/__openerp__.py
diff --git a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
index 8cccce03fc5..526930b941e 100755
--- a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
@@ -44,6 +44,7 @@
         <record id="action_config_tax_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_config_tax"/>
             <field name="sequence">5</field>
+            <field name="restart">onskip</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard.xml b/addons/l10n_ch_chart_c2c_pcg/wizard.xml
index 0267a823f93..8b50c2eafed 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard.xml
@@ -7,6 +7,7 @@
                 This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="sequence">4</field>
+            <field name="restart">onskip</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__openerp__.py
similarity index 100%
rename from addons/l10n_chart_uk_minimal/__terp__.py
rename to addons/l10n_chart_uk_minimal/__openerp__.py
diff --git a/addons/l10n_chart_uk_minimal/i18n/oc.po b/addons/l10n_chart_uk_minimal/i18n/oc.po
index 4768cb698cb..f2a9747e115 100644
--- a/addons/l10n_chart_uk_minimal/i18n/oc.po
+++ b/addons/l10n_chart_uk_minimal/i18n/oc.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-12 14:00+0000\n"
+"PO-Revision-Date: 2010-04-17 09:33+0000\n"
 "Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -42,12 +42,12 @@ msgstr "Produches"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
 msgid "Tax"
-msgstr "Impôts et taxes"
+msgstr "Impòstes e taxas"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
 msgid "Cash"
-msgstr ""
+msgstr "Liquiditats"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml b/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
index b45012c87be..63a56521bd8 100644
--- a/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
@@ -2,13 +2,14 @@
 <openerp>
     <data>
 
-		<record id="config_call_account_template_uk_minimal" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-	        <field name="state">open</field>
-    	</record>
+        <record id="config_call_account_template_uk_minimal" model="ir.actions.todo">
+            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="state">open</field>
+            <field name="restart">onskip</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__openerp__.py
similarity index 100%
rename from addons/l10n_fr/__terp__.py
rename to addons/l10n_fr/__openerp__.py
diff --git a/addons/l10n_fr/l10n_fr_pcg_wizard.xml b/addons/l10n_fr/l10n_fr_pcg_wizard.xml
index ea260b8fc0f..3fe6f946717 100644
--- a/addons/l10n_fr/l10n_fr_pcg_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_pcg_wizard.xml
@@ -2,24 +2,25 @@
 <openerp>
   <data>
     <wizard  id="wizard_l10n_fr_pcg_cdr_report"
-	     string="Compte de resultat" 
-	     model="account.move.line"
-	     name="l10n.fr.cdr.report"
-	     keyword="client_print_multi"
-	     />
-	     
+         string="Compte de resultat" 
+         model="account.move.line"
+         name="l10n.fr.cdr.report"
+         keyword="client_print_multi"
+         />
+         
     <wizard  id="wizard_l10n_fr_pcg_bilan_report"
-	     string="Bilan" 
-	     model="account.move.line"
-	     name="l10n.fr.bilan.report"
-	     keyword="client_print_multi"
-	     />
-	     
-	<record id="config_call_account_template_fr_pcg" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-  	</record>     
+         string="Bilan" 
+         model="account.move.line"
+         name="l10n.fr.bilan.report"
+         keyword="client_print_multi"
+         />
+         
+    <record id="config_call_account_template_fr_pcg" model="ir.actions.todo">
+            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="restart">onskip</field>
+      </record>
   </data>
 </openerp>
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__openerp__.py
similarity index 100%
rename from addons/l10n_lu/__terp__.py
rename to addons/l10n_lu/__openerp__.py
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index cbbf76975c4..da34f6456ab 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -4,6 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="restart">onskip</field>
     </record>
 
     <menuitem
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__openerp__.py
similarity index 100%
rename from addons/lunch/__terp__.py
rename to addons/lunch/__openerp__.py
diff --git a/addons/mail_gateway/__terp__.py b/addons/mail_gateway/__openerp__.py
similarity index 100%
rename from addons/mail_gateway/__terp__.py
rename to addons/mail_gateway/__openerp__.py
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__openerp__.py
similarity index 100%
rename from addons/mrp/__terp__.py
rename to addons/mrp/__openerp__.py
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index eda4f076602..8fee7293663 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -334,12 +334,13 @@ class mrp_bom(osv.osv):
                     d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
+                    print mult, wc_use.hour_nbr, wc.time_start, wc.time_stop, cycle
                     result2.append({
                         'name': bom.routing_id.name,
                         'workcenter_id': wc.id,
                         'sequence': level+(wc_use.sequence or 0),
                         'cycle': cycle,
-                        'hour': float(wc_use.hour_nbr*mult + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)),
+                        'hour': float(wc_use.hour_nbr*mult + ((wc.time_start or 0.0)+(wc.time_stop or 0.0)+cycle*(wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)),
                     })
             for bom2 in bom.bom_lines:
                 res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9186e693272..3432635cbe8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -39,7 +39,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="group_mrp_manager"
+            groups="base.group_extended"
             sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
@@ -323,14 +323,17 @@
                   id="menu_mrp_bom"
                   parent="menu_mrp_bom"
                   sequence="50" />-->
-        <menuitem action="mrp_bom_form_action"
-                  id="menu_mrp_bom_form_action"
-                  parent="menu_mrp_bom"
-                  sequence="10"/>
-        <menuitem action="mrp_bom_form_action2"
-                  id="menu_mrp_bom_form_action2"
-                  parent="menu_mrp_bom"
-                  sequence="20"/>
+        <menuitem
+            action="mrp_bom_form_action"
+            id="menu_mrp_bom_form_action"
+            parent="menu_mrp_bom"
+            sequence="10"/>
+        <menuitem
+            action="mrp_bom_form_action2"
+            id="menu_mrp_bom_form_action2"
+            groups="base.group_extended"
+            parent="menu_mrp_bom"
+            sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Bill of Materials Structure</field>
@@ -1034,7 +1037,10 @@
 
         <!-- Menu for Resource for MRP-->
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
-        <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
+
+        <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
+            groups="base.group_extended"
+            sequence="2"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 5de7c7be34b..cf66f93f0e4 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -50,8 +50,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="base.menu_mrp_root" sequence="49"/>
-        <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
+        <menuitem id="next_id_77" name="Reporting"
+            parent="base.menu_mrp_root" sequence="49"/>
+        <menuitem action="action_report_workcenter_load_tree"
+            id="menu_report_workcenter_load" parent="next_id_77"
+            groups="base.group_extended"/>
 
         <!-- stock.move compared to internal location src/dest -->
 
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__openerp__.py
similarity index 100%
rename from addons/mrp_jit/__terp__.py
rename to addons/mrp_jit/__openerp__.py
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__openerp__.py
similarity index 100%
rename from addons/mrp_operations/__terp__.py
rename to addons/mrp_operations/__openerp__.py
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index bf903bbf5e1..fccc62edab7 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -70,7 +70,7 @@
 
                     <separator string="Status" colspan="4"/>
                     <group colspan="8" col="8">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="button_draft" string="Set Draft" states="cancel"/>
                         <button name="button_start_working" string="Start" states="draft"/>
                         <button name="button_resume" string="Resume" states="pause"/>
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__openerp__.py
similarity index 100%
rename from addons/mrp_repair/__terp__.py
rename to addons/mrp_repair/__openerp__.py
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index e532341d922..9f629ad8a46 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -13,11 +13,11 @@
                         <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
                         <field name="deliver_bool"/>
                         <newline/>
-                        <field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id,product_id)"/>
+                        <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
                         <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
                         <field name="repaired"/>
                         <newline/>
-                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
                         <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
                         <field name="invoiced"/>
                     </group>
@@ -78,7 +78,7 @@
                             </group>
                             <newline/>
                             <group col="13" colspan="4">
-                                <field name="state" select="2"/>
+                                <field name="state"/>
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                                 <button name="repair_ready" states="confirmed" string="Start Repair"/>
                                 <button name="action_repair_start" states="ready" string="Start Repair"/>
@@ -158,11 +158,11 @@
                 <tree string="Repairs order">
                     <field name="name" select="1" />
                         <field name="product_id" select="1" />
-                        <field name="prodlot_id" select="2"/>
-                        <field name="partner_id" select="2"/>
+                        <field name="prodlot_id"/>
+                        <field name="partner_id"/>
                         <field name="address_id"/>
                             <field name="location_id"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                             <field name="move_id"/>
                             <field name="location_dest_id"/>
                             <field name="guarantee_limit"/>
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__openerp__.py
similarity index 100%
rename from addons/mrp_subproduct/__terp__.py
rename to addons/mrp_subproduct/__openerp__.py
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__openerp__.py
similarity index 100%
rename from addons/multi_company/__terp__.py
rename to addons/multi_company/__openerp__.py
diff --git a/addons/olap/__terp__.py b/addons/olap/__openerp__.py
similarity index 100%
rename from addons/olap/__terp__.py
rename to addons/olap/__openerp__.py
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index 05be10fd8a5..c3f43b89740 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -1,642 +1,676 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+	<data>
 
-<!-- Wizard view for the load data -->
-
-        <record id="bi_load_db_form" model="ir.ui.view">
-            <field name="name">bi.load.db.form</field>
-            <field name="model">bi.load.db.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Load Database Tables">
-                    <label align="0.0" string="We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs." colspan="4" />
-                    <newline/>
-                    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:" colspan="4"/>
-                    <newline/>
-                    <field name="fact_table" />
-                    <field name="db_name" />
-                    <newline/>
-                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
-                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
-            <field name="name">Load database Structure</field>
-            <field name="res_model">bi.load.db.wizard</field>
-            <field name="src_model">olap.schema</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1"/>
-            <field name="target">new</field>
-        </record>
-
-
-<!-- Wizard For Olap Warehouse -->
-
-        <record id="view_warehouse_bi" model="ir.ui.view">
-            <field name="name">Olap Warehouse</field>
-            <field name="model">olap.warehouse.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Warehouse">
-                    <group colspan="16">
-                    <separator string="Query" colspan="16"/>
-                    <field name="query" nolabel="1" colspan="16"/>
-                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_olap_warehouse" model="ir.actions.act_window">
-            <field name="name">Olap Warehouse</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">olap.warehouse.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem
-        name="Olap Warehouse"
-        action="action_olap_warehouse"
-        id="menu_bi_warehouse"
-        sequence="51"
-        parent="base.next_id_50"
-        />
-
-<!-- Wizard View for the parameters wizard -->
-
-        <record id="view_config_bi" model="ir.ui.view">
-            <field name="name">Parameters Configuration</field>
-            <field name="model">olap.parameters.config.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Parameters Configure">
-                    <separator string="BI Web Client." colspan="4"/>
-                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
-                    <field name="host_name" colspan="4"/>
-                    <field name="host_port" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_config_bi_parameters" model="ir.actions.act_window">
-            <field name="name">Parameters Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">olap.parameters.config.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem
-        name="Server Parameters"
-        action="action_config_bi_parameters"
-        id="menu_bi_server_parameters"
-        sequence="50"
-        parent="base.next_id_50"
-        />
-        <record model="ir.actions.todo" id="config_auto_directory">
-            <field name="name">Server Parameters Configuration</field>
-            <field name="note">This wizard will configure the URL of the web client</field>
-            <field name="action_id" ref="action_config_bi_parameters"/>
-        </record>
-
-
-<!-- Wizard view for the Auto Configuring the data -->
-
-        <record id="bi_auto_configure_form" model="ir.ui.view">
-            <field name="name">bi.auto.configure.form</field>
-            <field name="model">bi.auto.configure.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Auto Congifuring Tables">
-                    <label align="0.0" string="This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option." colspan="4" />
-                    <field name="name" select="1" colspan="4"/>
-                    <newline/>
-                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
-                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_bi_auto_configure" model="ir.actions.act_window">
-            <field name="name">Auto Configuration</field>
-            <field name="res_model">bi.auto.configure.wizard</field>
-            <field name="src_model">olap.schema</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1"/>
-            <field name="target">new</field>
-        </record>
-
-
-
-    # ------------------------------------------------------------------
-    # Olap Schema
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_schema_tree">
-        <field name="name">olap.schema.tree</field>
-        <field name="model">olap.schema</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Schema">
-                <field name="name"/>
-                <field name="database_id"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_olap_schema_form">
-        <field name="name">olap.schema.form</field>
-        <field name="model">olap.schema</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap Schema">
-              <field name="name" select="1" colspan="4"/>
-              <field name="database_id" select="2" colspan="4"/>
-              <field name="loaded" colspan="3"/>
-              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
-              <field name="configure" colspan="3"/>
-              <button name="%(bi_load_configuration_table)d"
-              	string="ReConfigure Structure" type="action"
-              	states="done" />
-              <field name="ready" select="2" colspan="3"/>
-              <field name="note" colspan="4"/>
-              <field name="state" select="2" colspan="2" />
-              <group colspan="2">
-                <button string="Connect to Database" name="dbconnect" states="none"/>
-                <button string="Load Database Structure"
-                	name="%(act_bi_load_db_wizard)d" type="action"
-                	states="dbconnect" target="new" />
-                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
-                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
-              </group>
-              <separator string="Auto Application Configuration" colspan="4"/>
-              <field name="app_detect" nolabel="1" colspan="3"/>
-              <button string="Configure Automatically "
-              	name="%(act_bi_auto_configure)d" type="action"
-              	states="dbload" target="new" />
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_schema_form">
-        <field name="name">Olap Schemas</field>
-        <field name="res_model">olap.schema</field>
-        <field name="view_type">form</field>
-
-    </record>
-    <menuitem
-        name="Olap Schema"
-        action="action_olap_schema_form"
-        id="menu_action_olap_schema_form"
-        parent="menu_bi_conf_cubes"/>
-
-    # ------------------------------------------------------------------
-    # Olap Cubes Table
-    # ------------------------------------------------------------------
-    <record model="ir.ui.view" id="view_olap_cube_table_form">
-        <field name="name">olap.cube.table.form</field>
-        <field name="model">olap.cube.table</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap cube_table" >
-                <field name="name" select="2"/>
-                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
-                <newline/>
-                <separator colspan="2" string="Joined Tables"/>
-                <field invisible="True" name="line_ids" nolabel="1">
-                    <form string="Database Tables">
-                        <field name="table_id"/>
-                        <field name="field_id"/>
-                    </form>
-                    <tree string="Database Tables">
-                        <field name="table_id"/>
-                        <field name="field_id"/>
-                    </tree>
-                </field>
-                <field name="available_table_ids" colspan="4"
-                	nolabel="1" readonly="0"
-                	domain="[('available_table_ids','in',available_table_ids)]"
-                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
-                	<tree string="Database Tables">
-                		<field name="related_to" string="Joined Table" />
-                		<field name="name" />
-                		<field name="table_id" />
-                		<field name="primary_key" />
-                	</tree>
-                </field>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
-        <field name="name">Olap Cube Tables</field>
-        <field name="res_model">olap.cube.table</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Cubes Table"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_cube_table_form"
-        id="menu_action_olap_cube_table_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Cubes
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_cube_tree">
-        <field name="name">olap.cube.tree</field>
-        <field name="model">olap.cube</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap cube">
-                <field name="name"/>
-                <field name="table_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_cube_form">
-        <field name="name">olap.cube.form</field>
-        <field name="model">olap.cube</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap cube">
-                <field name="name" select="1" colspan="4"/>
-                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
-                <field name="query_log" select="2"/>
-                <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_cube_form">
-        <field name="name">Olap Cubes</field>
-        <field name="res_model">olap.cube</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Cubes"
-        parent ="menu_bi_conf_cubes"
-        action="action_olap_cube_form"
-        id="menu_action_olap_cube_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Dimensions
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_dimension_tree">
-        <field name="name">olap.dimension.tree</field>
-        <field name="model">olap.dimension</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap dimension">
-                <field name="name"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_dimension_form">
-        <field name="name">olap.dimension.form</field>
-        <field name="model">olap.dimension</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap dimension">
-                <field name="name" select="1"/>
-                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_dimension_form">
-        <field name="name">Olap Dimensions</field>
-        <field name="res_model">olap.dimension</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Dimension"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_dimension_form"
-        id="menu_action_olap_dimension_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Hierarchies
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
-        <field name="name">olap.hierarchy.tree</field>
-        <field name="model">olap.hierarchy</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap hierarchy">
-                <field name="name"/>
-                <field name="dimension_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_hierarchy_form">
-        <field name="name">olap.hierarchy.form</field>
-        <field name="model">olap.hierarchy</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap hierarchy">
-                <field name="name" select="1" colspan="4"/>
-                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
-<!--                <field name="field_name" select="2"/>-->
-                <field name="sequence"/>
-                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
-<!--                <separator string="Levels" colspan="4"/>
-                <field name="level_ids" colspan="4" nolabel="1"/>-->
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
-        <field name="name">Olap Hierarchies</field>
-        <field name="res_model">olap.hierarchy</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Hierarchy"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_hierarchy_form"
-        id="menu_action_olap_hierarchy_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Levels
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_level_tree">
-        <field name="name">olap.level.tree</field>
-        <field name="model">olap.level</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Level">
-                <field name="name"/>
-                <field name="column_name"/>
-                <field name="column_id_name" invisible="True"/>
-                <field name="type"/>
-                <field name="table_name" invisible="True"/>
-                <field name="sequence"/>
-                <field name="hierarchy_id"/>
-
-
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_level_form">
-        <field name="name">olap.level.form</field>
-        <field name="model">olap.level</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap level">
-                <field name="name" select="1" colspan="4"/>
-                <field name="column_name" select="1"
-                	on_change="onchange_column_name(column_name)"
-                	context="{'filter_cols_hier':hierarchy_id}" />
-                <field name="column_id_name" select="1"/>
-                <field name="type" select="1"/>
-                <field name="table_name" select="1"/>
-                <field name="sequence"/>
-                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
-            </form>
-       </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_level_form">
-        <field name="name">Olap Level</field>
-        <field name="res_model">olap.level</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Level"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_level_form"
-        id="menu_action_olap_level_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Measure
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_measure_tree">
-        <field name="name">olap.measure.tree</field>
-        <field name="model">olap.measure</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap measure">
-                <field name="name"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_measure_form">
-        <field name="name">olap.measure.form</field>
-        <field name="model">olap.measure</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap measure">
-                <field name="name" select="1"/>
-                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-                <field name="value_column_id_name" invisible="True"/>
-                <field name="table_name" invisible="True"/>
-                <field name="measure_type"/>
-                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
-                    <newline/>
-                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
-                    <field name="agregator" select="2"/>
-                    <field name="formatstring" select="2"/>
-                </group>
-                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
-                    <newline/>
-                    <field name="value_sql" colspan="4" select="2"
-                    	attrs="{'required':[('measure_type','=','sql_expr')]}" />
-                    <field name="datatype" select="2"/>
-                </group>
-            </form>
-
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_measure_form">
-        <field name="name">Olap Measures</field>
-        <field name="res_model">olap.measure</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Measures"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_measure_form"
-        id="menu_action_olap_measure_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Saved Query
-    # ------------------------------------------------------------------
-    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
-        <field name="name">olap.saved.query.tree</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Saved Query">
-            	<field name="name"/>
-                <field name="cube_id"/>
-                <field name="mdx_id"/>
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="time"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
-        <field name="name">olap.saved.query.mdx</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">mdx</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Saved Query">
-            	<field name="name"/>
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-                <field name="mdx_id"/>
-                <field name="axis_keys" readonly="True"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_saved_query_form">
-        <field name="name">olap.saved.query.form</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap Saved Query">
-             	<field name="name" select="1" readonly="True"/>
-                <field name="query" select="1" colspan="4" readonly="True"/>
-                <field name="user_id" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-                <field name="mdx_id" select="2" readonly="True"/>
-                <field name="schema_id" select="2" readonly="True"/>
-                <field name="axis_keys" readonly="True"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
-        <field name="name">Olap Saved Query</field>
-        <field name="res_model">olap.saved.query</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,mdx</field>
-    </record>
-    <menuitem
-        name="Olap Saved Query"
-        parent = "menu_bi_conf_tools"
-        action="action_olap_saved_query_form"
-        id="menu_action_olap_saved_query_form"/>
-
-<!-- All Logs -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="All Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-                <field name="schema_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_query_logs_form">
-        <field name="name">olap.query.logs.form</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="All Logs">
-                <field name="query" colspan="4" select="1" readonly="True"/>
-                <field name="time" select="2" readonly="True"/>
-                <field name="result_size" select="2" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-                <field name="count" readonly="True"/>
-                <field name="schema_id" readonly="True"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
-        <field name="name">All Logs</field>
-        <field name="res_model">olap.query.logs</field>
-        <field name="view_type">form</field>
-    </record>
-
-    <menuitem
-        name="All Logs"
-        action="action_olap_query_logs_form"
-        id="menu_action_olap_query_logs_form"
-        parent="menu_bi_conf_tools"/>
-
-<!-- All Logs / My logs -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="My Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">mdx</field>
-        <field name="arch" type="xml">
-            <tree string="My Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-
-<!-- Query Logs  -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
-        <field name="name">olap.query.logs.form</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="My Logs">
-                <field name="user_id" select="1" readonly="True"/>
-                <field name="query" select="1" readonly="True"/>
-                <field name="time" select="2" readonly="True"/>
-                <field name="result_size" select="2" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-
-            </form>
-        </field>
-
-    </record>
-
-    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
-        <field name="name">My Logs</field>
-        <field name="res_model">olap.query.logs</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,mdx</field>
-        <field name="domain">[('user_id','=',uid)]</field>
-    </record>
-
-    <menuitem
-        name="My Logs"
-        action="action_olap_query_logs_my_form"
-        id="menu_action_olap_query_logs_my_form"
-        parent="menu_action_olap_query_logs_form"/>
-
-</data>
+	<!-- Wizard view for the load data -->
+	
+	        <record id="bi_load_db_form" model="ir.ui.view">
+	            <field name="name">bi.load.db.form</field>
+	            <field name="model">bi.load.db.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Load Database Tables">
+	                    <label align="0.0" string="We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs." colspan="4" />
+	                    <newline/>
+	                    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:" colspan="4"/>
+	                    <newline/>
+	                    <field name="fact_table" />
+	                    <field name="db_name" />
+	                    <newline/>
+	                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+	                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
+	            <field name="name">Load database Structure</field>
+	            <field name="res_model">bi.load.db.wizard</field>
+	            <field name="src_model">olap.schema</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="auto_refresh" eval="1"/>
+	            <field name="target">new</field>
+	        </record>
+	
+	
+	<!-- Wizard For Olap Warehouse -->
+	
+	        <record id="view_warehouse_bi" model="ir.ui.view">
+	            <field name="name">Olap Warehouse</field>
+	            <field name="model">olap.warehouse.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Warehouse">
+	                    <group colspan="16">
+	                    <separator string="Query" colspan="16"/>
+	                    <field name="query" nolabel="1" colspan="16"/>
+	                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
+	                    </group>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="action_olap_warehouse" model="ir.actions.act_window">
+	            <field name="name">Olap Warehouse</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">olap.warehouse.wizard</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	        <menuitem
+	        name="Olap Warehouse"
+	        action="action_olap_warehouse"
+	        id="menu_bi_warehouse"
+	        sequence="51"
+	        parent="base.next_id_50"
+	        />
+	
+	<!-- Wizard View for the parameters wizard -->
+	
+	        <record id="view_config_bi" model="ir.ui.view">
+	            <field name="name">Parameters Configuration</field>
+	            <field name="model">olap.parameters.config.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Parameters Configure">
+	                    <separator string="BI Web Client." colspan="4"/>
+	                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
+	                    <field name="host_name" colspan="4"/>
+	                    <field name="host_port" colspan="4"/>
+	                    <separator string="" colspan="4"/>
+	                    <label string="" colspan="2"/>
+	                    <group col="4" colspan="2">
+	                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+	                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+	                    </group>
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="action_config_bi_parameters" model="ir.actions.act_window">
+	            <field name="name">Parameters Configuration</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">olap.parameters.config.wizard</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	        <menuitem
+	        name="Server Parameters"
+	        action="action_config_bi_parameters"
+	        id="menu_bi_server_parameters"
+	        sequence="50"
+	        parent="base.next_id_50"
+	        />
+	        
+	        <record model="ir.actions.todo" id="config_auto_directory">
+	            <field name="name">Server Parameters Configuration</field>
+	            <field name="note">This wizard will configure the URL of the web client</field>
+	            <field name="action_id" ref="action_config_bi_parameters"/>
+	        </record>
+	
+	
+	<!-- Wizard view for the Auto Configuring the data -->
+	
+	        <record id="bi_auto_configure_form" model="ir.ui.view">
+	            <field name="name">bi.auto.configure.form</field>
+	            <field name="model">bi.auto.configure.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Auto Congifuring Tables">
+	                    <label align="0.0" string="This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option." colspan="4" />
+	                    <field name="name" select="1" colspan="4"/>
+	                    <newline/>
+	                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+	                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="act_bi_auto_configure" model="ir.actions.act_window">
+	            <field name="name">Auto Configuration</field>
+	            <field name="res_model">bi.auto.configure.wizard</field>
+	            <field name="src_model">olap.schema</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="auto_refresh" eval="1"/>
+	            <field name="target">new</field>
+	        </record>
+	
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Schema
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_schema_tree">
+	        <field name="name">olap.schema.tree</field>
+	        <field name="model">olap.schema</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Schema">
+	                <field name="name"/>
+	                <field name="database_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	    <record model="ir.ui.view" id="view_olap_schema_form">
+	        <field name="name">olap.schema.form</field>
+	        <field name="model">olap.schema</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap Schema">
+	              <field name="name" select="1" colspan="4"/>
+	              <field name="database_id" select="2" colspan="4"/>
+	              <field name="loaded" colspan="3"/>
+	              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
+	              <field name="configure" colspan="3"/>
+	              <button name="%(bi_load_configuration_table)d"
+	              	string="ReConfigure Structure" type="action"
+	              	states="done" />
+	              <field name="ready" select="2" colspan="3"/>
+	              <separator string="Schema description" colspan="4"/>
+	              <field name="note" colspan="4" nolabel="1"/>
+	              <field name="state" select="2" colspan="2" />
+	              <group colspan="2">
+	                <button string="Connect to Database" name="dbconnect" states="none"/>
+	                <button string="Load Database Structure"
+	                	name="%(act_bi_load_db_wizard)d" type="action"
+	                	states="dbconnect" target="new" />
+	                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
+	                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
+	              </group>
+	              <separator string="Auto Application Configuration" colspan="4"/>
+	              <field name="app_detect" nolabel="1" colspan="3"/>
+	              <button string="Configure Automatically "
+	              	name="%(act_bi_auto_configure)d" type="action"
+	              	states="dbload" target="new" />
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_schema_form">
+	        <field name="name">Olap Schemas</field>
+	        <field name="res_model">olap.schema</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Schema"
+	        action="action_olap_schema_form"
+	        id="menu_action_olap_schema_form"
+	        parent="menu_bi_conf_cubes"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Cubes Table
+	    # ------------------------------------------------------------------
+	    <record model="ir.ui.view" id="view_olap_cube_table_form">
+	        <field name="name">olap.cube.table.form</field>
+	        <field name="model">olap.cube.table</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap cube_table" >
+	                <field name="name" select="2"/>
+	                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
+	                <newline/>
+	                <separator colspan="2" string="Joined Tables"/>
+	                <field invisible="True" name="line_ids" nolabel="1">
+	                    <form string="Database Tables">
+	                        <field name="table_id"/>
+	                        <field name="field_id"/>
+	                    </form>
+	                    <tree string="Database Tables">
+	                        <field name="table_id"/>
+	                        <field name="field_id"/>
+	                    </tree>
+	                </field>
+	                <field name="available_table_ids" colspan="4"
+	                	nolabel="1" readonly="0"
+	                	domain="[('available_table_ids','in',available_table_ids)]"
+	                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
+	                	<tree string="Database Tables">
+	                		<field name="related_to" string="Joined Table" />
+	                		<field name="name" />
+	                		<field name="table_id" />
+	                		<field name="primary_key" />
+	                	</tree>
+	                </field>
+	            </form>
+	        </field>
+	    </record>
+	
+	    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
+	        <field name="name">Olap Cube Tables</field>
+	        <field name="res_model">olap.cube.table</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Cubes Table"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_cube_table_form"
+	        id="menu_action_olap_cube_table_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Cubes
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_cube_tree">
+	        <field name="name">olap.cube.tree</field>
+	        <field name="model">olap.cube</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap cube">
+	                <field name="name"/>
+	                <field name="table_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_cube_form">
+	        <field name="name">olap.cube.form</field>
+	        <field name="model">olap.cube</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap cube">
+	                <field name="name" select="1" colspan="2"/>
+	                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}" colspan="2"/>
+	                <field name="table_id"   context="{'parent_schema_id':schema_id}" colspan="2"/>
+	                <field name="query_log" select="2" colspan="2"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_cube_form">
+	        <field name="name">Olap Cubes</field>
+	        <field name="res_model">olap.cube</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Cubes"
+	        parent ="menu_bi_conf_cubes"
+	        action="action_olap_cube_form"
+	        id="menu_action_olap_cube_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Dimensions
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_dimension_tree">
+	        <field name="name">olap.dimension.tree</field>
+	        <field name="model">olap.dimension</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap dimension">
+	                <field name="name"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_dimension_form">
+	        <field name="name">olap.dimension.form</field>
+	        <field name="model">olap.dimension</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap dimension">
+	                <field name="name" select="1"/>
+	                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_dimension_form">
+	        <field name="name">Olap Dimensions</field>
+	        <field name="res_model">olap.dimension</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Dimension"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_dimension_form"
+	        id="menu_action_olap_dimension_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Hierarchies
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
+	        <field name="name">olap.hierarchy.tree</field>
+	        <field name="model">olap.hierarchy</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap hierarchy">
+	                <field name="name"/>
+	                <field name="dimension_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_hierarchy_form">
+	        <field name="name">olap.hierarchy.form</field>
+	        <field name="model">olap.hierarchy</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap hierarchy">
+	                <field name="name" select="1" colspan="2"/>
+	                <field name="sequence" colspan="2"/>
+	                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}" colspan="4"/>
+	<!--                <field name="field_name" select="2"/>-->
+	                
+	                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
+	<!--                <separator string="Levels" colspan="4"/>
+	                <field name="level_ids" colspan="4" nolabel="1"/>-->
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
+	        <field name="name">Olap Hierarchies</field>
+	        <field name="res_model">olap.hierarchy</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Hierarchy"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_hierarchy_form"
+	        id="menu_action_olap_hierarchy_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Levels
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_level_tree">
+	        <field name="name">olap.level.tree</field>
+	        <field name="model">olap.level</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Level">
+	                <field name="name"/>
+	                <field name="column_name"/>
+	                <field name="column_id_name" invisible="True"/>
+	                <field name="type"/>
+	                <field name="table_name" invisible="True"/>
+	                <field name="sequence"/>
+	                <field name="hierarchy_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_level_form">
+	        <field name="name">olap.level.form</field>
+	        <field name="model">olap.level</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap level">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="column_name" select="1"
+	                	on_change="onchange_column_name(column_name)"
+	                	context="{'filter_cols_hier':hierarchy_id}" />
+	                <field name="column_id_name" select="1"/>
+	                <field name="type" select="1"/>
+	                <field name="table_name" select="1"/>
+	                <field name="sequence"/>
+	                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
+	            </form>
+	       </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_level_form">
+	        <field name="name">Olap Level</field>
+	        <field name="res_model">olap.level</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Level"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_level_form"
+	        id="menu_action_olap_level_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Measure
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_measure_tree">
+	        <field name="name">olap.measure.tree</field>
+	        <field name="model">olap.measure</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap measure">
+	                <field name="name"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_measure_form">
+	        <field name="name">olap.measure.form</field>
+	        <field name="model">olap.measure</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap measure">
+	                <field name="name" select="1"/>
+	                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+	                <field name="value_column_id_name" invisible="True"/>
+	                <field name="table_name" invisible="True"/>
+	                <field name="measure_type"/>
+	                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
+	                    <newline/>
+	                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+	                    <field name="agregator" select="2" />
+	                    <field name="formatstring" select="2"/>
+	                </group>
+	                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+	                    <newline/>
+	                    <separator string="SQL Expression" colspan="4"/>
+	                    <field name="value_sql" colspan="4" select="2"
+	                    	attrs="{'required':[('measure_type','=','sql_expr')]}" nolabel="1" />
+	                    <field name="datatype" select="2"/>
+	                </group>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_measure_form">
+	        <field name="name">Olap Measures</field>
+	        <field name="res_model">olap.measure</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Measures"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_measure_form"
+	        id="menu_action_olap_measure_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Saved Query
+	    # ------------------------------------------------------------------
+	    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
+	        <field name="name">olap.saved.query.tree</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Saved Query">
+	            	<field name="name"/>
+	                <field name="cube_id"/>
+	                <field name="mdx_id"/>
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="time"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
+	        <field name="name">olap.saved.query.mdx</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">mdx</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Saved Query">
+	            	<field name="name"/>
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	                <field name="mdx_id"/>
+	                <field name="axis_keys" readonly="True"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_saved_query_form">
+	        <field name="name">olap.saved.query.form</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap Saved Query">
+	            	<group colspan="4">
+		            	<field name="user_id" readonly="True"/>
+		                <field name="cube_id" select="2" readonly="True"/>
+		                <field name="mdx_id" select="2" readonly="True"/>
+		                <field name="schema_id" select="2" readonly="True"/>
+	                </group>
+		                <separator string="Query Name" colspan="4"/>
+		             	<field name="name" select="1" readonly="True" nolabel="1"/>
+		             	<separator string="Query" colspan="4"/>
+		                <field name="query" select="1" colspan="4" readonly="True" nolabel="1"/>
+		                <separator string="Axis Keys" colspan="4"/>
+		                <field name="axis_keys" readonly="True" nolabel="1"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
+	        <field name="name">Olap Saved Query</field>
+	        <field name="res_model">olap.saved.query</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form,mdx</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Saved Query"
+	        parent = "menu_bi_conf_tools"
+	        action="action_olap_saved_query_form"
+	        id="menu_action_olap_saved_query_form"/>
+	
+	<!-- All Logs -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="All Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	                <field name="schema_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_query_logs_form">
+	        <field name="name">olap.query.logs.form</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="All Logs">
+	            	<field name="cube_id" select="2" readonly="True" colspan="2"/>
+	            	<field name="schema_id" readonly="True" colspan="2"/>
+	            	<field name="time" select="2" readonly="True" colspan="4"/>
+	            	<field name="result_size" select="2" readonly="True" colspan="2"/>
+	            	<field name="count" readonly="True" colspan="2"/>
+	            	<separator string="Query" colspan="4"/>
+	                <field name="query" colspan="4" select="1" readonly="True" nolabel="1"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
+	        <field name="name">All Logs</field>
+	        <field name="res_model">olap.query.logs</field>
+	        <field name="view_type">form</field>
+	    </record>
+	
+	    <menuitem
+	        name="All Logs"
+	        action="action_olap_query_logs_form"
+	        id="menu_action_olap_query_logs_form"
+	        parent="menu_bi_conf_tools"/>
+	
+	<!-- All Logs / My logs -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="My Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">mdx</field>
+	        <field name="arch" type="xml">
+	            <tree string="My Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	<!-- Query Logs  -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
+	        <field name="name">olap.query.logs.form</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="My Logs">
+	                <field name="user_id" select="1" readonly="True"/>
+	                <separator string="Query" colspan="4"/>
+	                <field name="query" colspan="4" select="1" readonly="True" nolabel="1"/>
+	                <field name="time" select="2" readonly="True"/>
+	                <field name="result_size" select="2" readonly="True"/>
+	                <field name="cube_id" select="2" readonly="True"/>
+	            </form>
+	        </field>
+	    </record>
+	
+	    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
+	        <field name="name">My Logs</field>
+	        <field name="res_model">olap.query.logs</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form,mdx</field>
+	        <field name="domain">[('user_id','=',uid)]</field>
+	    </record>
+	
+	    <menuitem
+	        name="My Logs"
+	        action="action_olap_query_logs_my_form"
+	        id="menu_action_olap_query_logs_my_form"
+	        parent="menu_action_olap_query_logs_form"/>
+	
+	</data>
 </openerp>
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index 74a794d9eee..0dc543ace1e 100755
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -230,10 +230,11 @@
         <field name="arch" type="xml">
             <form string="Olap Application">
                 <newline/>
-                <field name="name" select="1" colspan="2"/>
-                <field name="query" select="1" colspan="2"/>
-                <field name="table_ids" select="1" colspan="4" nolabel="1"/>
-                <field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
+                	<field name="name" select="1" colspan="2"/>
+                	<separator colspan="4" string="Application query"/>
+                	<field name="query" select="1" colspan="4" nolabel="1"/>
+                	<field name="table_ids" select="1" colspan="4" nolabel="1"/>
+                	<field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
             </form>
         </field>
     </record>
@@ -274,8 +275,9 @@
                 <newline/>
                 <field name="name" select="1" colspan="2"/>
                 <field name="table_name" select="1" />
-                <field name="is_hidden" select="1" colspan="2" />
                 <field name="application_id" select="1" />
+                <field name="is_hidden" select="1" colspan="2" />
+                
             </form>
         </field>
     </record>
@@ -320,9 +322,10 @@
                 <field name="name" select="1" colspan="2"/>
                 <field name="field_name" select="1" />
                 <field name="table_name" select="1" />
+                <field name="application_id" select="1" />
                 <newline/>
                 <field name="is_hidden" select="1" colspan="2"/>
-                <field name="application_id" select="1" />
+                
             </form>
         </field>
     </record>
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 5081619ce71..338d61f81fa 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -40,15 +40,17 @@ class olap_fact_database(osv.osv):
     _description = "Olap Fact Database"
 
     def _connection_get(self, cr, uid, ids, field_name, arg, context = {}):
-        """
-            Return a connection string url needed by SQL Alchemy. Exemple:
+        """  Return a connection string url needed by SQL Alchemy. Exemple:
             'postgres://scott:tiger@localhost:5432/mydatabase'
+
+             @param self: The object pointer
              @param cr: the current row, from the database cursor,
              @param uid: the current user’s ID for security checks,
              @param ids: List of connection’s IDs
+             @param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
              @param context: A standard dictionary for contextual values
-
         """
+
         res = {}
         for obj in self.browse(cr, uid, ids, context):
             res[obj.id] = '%s://%s:%s@%s:%d/%s' % (obj.type, obj.db_login, \
@@ -56,14 +58,13 @@ class olap_fact_database(osv.osv):
         return res
 
     def test_connection(self, cr, uid, ids, context = {}):
-
         """ Test connection for postgres Or ,MySql Or ,Oracle
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Test Connection’s IDs
-        @param context: A standard dictionary for contextual values
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Test Connection’s IDs
+            @param context: A standard dictionary for contextual values
         """
-
         try:
             self_obj = self.browse(cr, uid, ids, context)
             for obj in self_obj:
@@ -140,16 +141,16 @@ class olap_schema(osv.osv ):
     _description = "Olap Schema"
 
     def _app_detect(self, cr, uid, ids, field_name, arg, context = {}):
-
         """
             Return a Application type
+            @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Detected Application’s IDs
             @param context: A standard dictionary for contextual values
         """
-        res = {}
 
+        res = {}
         app_objs = self.pool.get('olap.application')
         app_ids = app_objs.search(cr, uid, [])
         app_res = app_objs.browse(cr, uid, app_ids)
@@ -202,13 +203,13 @@ class olap_schema(osv.osv ):
         }
 
     def action_dbconnect(self, cr, uid, ids, context = {}):
-
-        """ Connect DB with postgres ,Or MySql , Or  Orcale
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Database Connection action’s IDs
-        @param context: A standard dictionary for contextual values
-    """
+        """ Connect DB with postgres ,Or MySql,Or Orcale
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Database Connection action’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         schema = self.browse(cr, uid, ids, context)[0]
         type = schema.database_id.type
@@ -255,12 +256,12 @@ class olap_schema(osv.osv ):
         return True
 
     def action_dbload(self, cr, uid, ids, context = {}):
-
-        """ Load DB
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Database Load Action’s IDs
-         @param context: A standard dictionary for contextual values
+        """  Load DB
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Database Load Action’s IDs
+             @param context: A standard dictionary for contextual values
         """
 
         for id in ids:
@@ -271,12 +272,12 @@ class olap_schema(osv.osv ):
 
 
     def action_dbconfigure(self, cr, uid, ids, context = {}):
-
-        """ Configure with Database
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Database Configuraion Action’s IDs
-         @param context: A standard dictionary for contextual values
+        """  Configure with Database
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Database Configuraion Action’s IDs
+             @param context: A standard dictionary for contextual values
         """
 
         for id in ids:
@@ -288,11 +289,12 @@ class olap_schema(osv.osv ):
         return True
 
     def action_dbready(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-        @param ids: List of Database Action’s IDs
-        @param context: A standard dictionary for contextual values """
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Database Action’s IDs
+            @param context: A standard dictionary for contextual values """
 
         for id in ids:
             self.write(cr, uid, id, {'ready': True})
@@ -300,11 +302,12 @@ class olap_schema(osv.osv ):
         return True
 
     def action_done(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-        @param ids: List of Action’s IDs
-        @param context: A standard dictionary for contextual values """
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Action’s IDs
+            @param context: A standard dictionary for contextual values """
 
         for id in ids:
             self.write(cr, uid, id, {'state': 'done'})
@@ -343,12 +346,12 @@ class olap_schema(osv.osv ):
         raise 'Not implemented !'
 
     def request(self, cr, uid, name, request, context = {}):
-
         """
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Request’s IDs
-        @param context: A standard dictionary for contextual values
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Request’s IDs
+            @param context: A standard dictionary for contextual values
         """
 
         ids = self.search(cr, uid, [('name', '=', name)])
@@ -387,7 +390,7 @@ olap_schema()
 
 
 class olap_database_tables(osv.osv):
-    """ Database Tables """
+    """Database Tables"""
 
     _name = "olap.database.tables"
     _description = "Olap Database Tables"
@@ -408,15 +411,15 @@ class olap_database_tables(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context = {}):
-
         """ Get Database Name
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Name’s IDs
-        @param context: A standard dictionary for contextual values """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Name’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         result = []
-
         for t in self.browse(cr, uid, ids, context):
 
             if t.name <> t.table_db_name:
@@ -427,10 +430,12 @@ class olap_database_tables(osv.osv):
 
     def show_col_view(self, cr, uid, ids, context = {}):
         """ Open Tree View of Database Columns
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Column’s IDs
-         @param context: A standard dictionary for contextual values """
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Column’s IDs
+             @param context: A standard dictionary for contextual values
+        """
 
         ids_cols = self.pool.get('olap.database.columns').search(cr, uid, ([('table_id', '=', ids[0])]))
         id = self.pool.get('ir.ui.view').search(cr, uid, \
@@ -448,16 +453,30 @@ class olap_database_tables(osv.osv):
 
     def hide_col(self, cr, uid, ids, context = {}):
         # To hide all the related columns also
+        """ Hide all the related columns
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Hide Column’s IDs
+             @param context: A standard dictionary for contextual values
+        """
+
         for id in ids:
-            self.write(cr, uid, id, {'hide':True})
+            self.write(cr, uid, id, {'hide': True})
         return {}
 
     def show_col(self, cr, uid, ids, context = {}):
         # To show or unhide all the columns also
-        for id in ids:
-            self.write(cr, uid, id, {'hide':False})
-        return {}
+        """ show all the related columns
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Column’s IDs
+             @param context: A standard dictionary for contextual values """
 
+        for id in ids:
+            self.write(cr, uid, id, {'hide': False})
+        return {}
 
 olap_database_tables()
 
@@ -476,20 +495,22 @@ class olap_database_columns(osv.osv):
         'float8': 'Double Precesion',
         'varchar': 'Character Varying',
         'bool': 'Boolean',
-        'bytea':'Byte A',
-        'int2':'Small Integer',
-        'int4':'Integer',
-        'int8':'Big Integer',
-        'text':'Text',
-        'date':'Date',
+        'bytea': 'Byte A',
+        'int2': 'Small Integer',
+        'int4': 'Integer',
+        'int8': 'Big Integer',
+        'text': 'Text',
+        'date': 'Date',
         'time': 'TimeStamp without Time Zone',
-    'number':'NUMBER',
+    'number': 'NUMBER',
     }
 
     def _datatypes_get(self, *args, **argv):
-
-        """ @param *args: For Positional Argument
-            @param **args: For Keyword Argument """
+        """
+            @param self: The object pointer
+            @param *args: For Positional Argument
+            @param **args: For Keyword Argument
+        """
 
         return self.datatypes.items()
 
@@ -512,15 +533,15 @@ class olap_database_columns(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context = {}):
-
         """ Get Database Column
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Name’s IDs
-         @param context: A standard dictionary for contextual values """
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Name’s IDs
+             @param context: A standard dictionary for contextual values
+        """
 
         result = []
-
         for t in self.browse(cr, uid, ids, context):
 
             if t.name <> t.column_db_name:
@@ -532,6 +553,15 @@ class olap_database_columns(osv.osv):
 
     def search(self, cr, uid, args, offset = 0, limit = None, order = None,
             context = None, count = False):
+        """ olap search method.
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user’s ID for security checks,
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to Pass
+            @param limit: The Number of Results to Return
+            @param context: A standard dictionary for contextual values
+        """
 
         if not context:
             return super(olap_database_columns, self).search(cr, uid, args, offset, limit,
@@ -594,7 +624,7 @@ class olap_database_columns(osv.osv):
             for lines in cube_obj.table_id.line_ids:
                 make_ids.append(lines.table_id.id)
 
-            if make_ids:
+            if make_ids and cube_obj.table_id.line_ids:
                 make_ids.append(cube_obj.table_id.line_ids[len(cube_obj.table_id.line_ids) - 1].field_id.related_to.id)
                 args = [('table_id', 'in', make_ids), ('related_to', '=', False), \
                     ('primary_key', '<>', True), \
@@ -647,33 +677,39 @@ class olap_database_columns(osv.osv):
 
 
     def hide_col(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Hide all the related columns
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Hide Column’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         for id in ids:
             self.write(cr, uid, id, {'hide':True})
         return {}
 
     def show_col(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ show all the related columns
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of column’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         for id in ids:
             self.write(cr, uid, id, {'hide': True})
         return {}
 
     def field_add(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Add all the Related Field
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Field’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         col_data = self.pool.get('olap.database.columns').read(cr, uid, ids, [], context)[0]
         ctx_list = []
@@ -687,9 +723,9 @@ class olap_database_columns(osv.osv):
         if context['parent_id']:
             parent_id = context['parent_id']
             val = {
-            'cube_table_id':parent_id,
-            'table_id':table_id,
-            'field_id':ids[0]
+            'cube_table_id': parent_id,
+            'table_id': table_id,
+            'field_id': ids[0]
             }
             id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context)
 
@@ -701,11 +737,13 @@ class olap_database_columns(osv.osv):
         return ctx_list
 
     def make_hierarchy(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Make Hierarchy on the cube
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Hierarchy’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         col_data = self.pool.get('olap.database.columns').read(cr, uid, ids, [], context)[0]
         ctx_list = []
@@ -719,9 +757,9 @@ class olap_database_columns(osv.osv):
             pk_table = cube_table_obj.name
 
         val = {
-             'field_name':col_data['name'],
-             'name':col_data['name'],
-             'primary_key_table':pk_table
+             'field_name': col_data['name'],
+             'name': col_data['name'],
+             'primary_key_table': pk_table
         }
 
         if context['hier_parent_id']:
@@ -751,11 +789,14 @@ class olap_cube_table(osv.osv):
     _description = "Olap cube table"
 
     def write(self, cr, uid, ids, vals, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Cube Table’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param vals: Get the Value's of cube table
+            @param context: A standard dictionary for contextual values
+        """
 
         if vals and vals.get('available_table_ids', 0) and context and \
             (context.has_key('master_dim') or context.has_key('d_id') or \
@@ -816,10 +857,13 @@ class olap_cube_table(osv.osv):
             return  super(olap_cube_table, self).write(cr, uid, ids, vals, context)
 
     def create(self, cr, uid, vals, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param vals: Get the Value's of cube table
+            @param context: A standard dictionary for contextual values
+        """
 
         cube_table_id = super(olap_cube_table, self).create(cr, uid, vals, context)
 
@@ -839,22 +883,35 @@ class olap_cube_table(osv.osv):
 
     def search(self, cr, uid, args, offset = 0, limit = None, order = None,
             context = None, count = False):
+        """ olap search method.
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user’s ID for security checks,
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to Pass
+            @param limit: The Number of Results to Return
+            @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('parent_schema_id'):
             args = [('schema_id', '=', context['parent_schema_id'])]
 
         if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(['d_id']))
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
             args = [('schema_id', '=', dim_obj.cube_id.schema_id.id)]
 
         return super(olap_cube_table, self).search(cr, uid, args, offset, limit, \
                                         order, context = context, count = count)
 
     def _available_table_get(self, cr, uid, ids, name, arg, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Available Table’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]
+            @param context: A standard dictionary for contextual values
+        """
 
         result = {}
         parent_table_id = []
@@ -871,10 +928,12 @@ class olap_cube_table(osv.osv):
         return result
 
     def _set_schema(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Set Schema for cube table
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
@@ -884,20 +943,24 @@ class olap_cube_table(osv.osv):
             return context['parent_schema_id']
 
     def _set_name(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ set name for cube table
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
             return dim_obj.cubeAid.table_id.name
 
     def _get_id(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
@@ -914,10 +977,12 @@ class olap_cube_table(osv.osv):
         return col_ids
 
     def _def_set(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         return []
 
@@ -925,8 +990,8 @@ class olap_cube_table(osv.osv):
         'name': fields.char('Table name', size = 64, required = True),
         'line_ids': fields.one2many('olap.cube.table.line', 'cube_table_id',\
                                  'Database Tables', required = True),
-        'schema_id':fields.many2one('olap.schema', 'Schema id', ondelete = 'cascade'),
-        'column_link_id':fields.many2one('olap.database.columns', 'Relational Column' , required = True),
+        'schema_id': fields.many2one('olap.schema', 'Schema id', ondelete = 'cascade'),
+        'column_link_id': fields.many2one('olap.database.columns', 'Relational Column' , required = True),
         'available_table_ids': fields.function(
             _available_table_get,
             method = True,
@@ -937,13 +1002,16 @@ class olap_cube_table(osv.osv):
     }
 
     _defaults = {
-        'schema_id':_set_schema,
+        'schema_id': _set_schema,
     }
     def field_add(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Add the Field for the cube table
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of cube table’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         return {}
 
@@ -966,10 +1034,11 @@ class olap_cube_table_line(osv.osv):
     }
     # Set the Table when changing field_id
     def onchange_field_id(self, *args, **argv):
-
-        """ @param *args: For Positional Argument
-            @param **args: For Keyword Argument """
-
+        """
+            @param self: The object pointer
+            @param *args: For Positional Argument
+            @param **argv: For Keyword Argument
+        """
         pass
 
 olap_cube_table_line()
@@ -982,10 +1051,11 @@ class olap_cube(osv.osv):
     _description = "Olap cube"
 
     def _set_schema(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set schema for olap cube
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('schema_id'):
@@ -1038,10 +1108,11 @@ class olap_dimension(osv.osv):
     _description = "Olap dimension"
 
     def _set_cube(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set cube for Olap Dimension
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('cube_id'):
@@ -1076,10 +1147,11 @@ class olap_hierarchy(osv.osv):
     }
 
     def _set_dimension(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set Dimension for Olap Hierarchy
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('dimension_id'):
@@ -1087,10 +1159,11 @@ class olap_hierarchy(osv.osv):
         return False
 
     def _set_name(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set name for Olap Hierarchy
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('dimension_id'):
@@ -1099,10 +1172,11 @@ class olap_hierarchy(osv.osv):
         return False
 
     def _hierarchy_get(self, *args, **argv):
-
-        """ @param *args: For Positional Argument
-            @param **args: For Keyword Argument """
-
+        """
+            @param self: The object pointer
+            @param *args: For Positional Argument
+            @param **args: For Keyword Argument
+        """
         return self.hierarchy_type.items()
 
     _columns = {
@@ -1140,30 +1214,37 @@ class olap_level(osv.osv):
     }
 
     def _set_hierarchy(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
+        """ set Hierarchy for Olap Level
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('hierarchy_id'):
             return context['hierarchy_id']
         return False
 
     def _set_name(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ set name for Olap Level
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('hierarchy_id'):
             hier_obj = self.pool.get('olap.hierarchy').browse(cr, uid, int(context['hierarchy_id']))
             return hier_obj.name
 
     def onchange_column_name(self, cr, uid, ids, column, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of Olap Level’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         if not column:
             return {}
@@ -1173,21 +1254,23 @@ class olap_level(osv.osv):
         val['column_id_name'] = col.column_db_name
         if (col.type == 'date'):
             val['type'] = 'date_year'
-        return {'value':val}
+        return {'value': val}
 
     def _type_get(self, cr, uid, *args, **argv):
-
-        """ @param *args: For Positional Argument
-        @param **args: For Keyword Argument
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param *args: For Positional Argument
+            @param **args: For Keyword Argument
         """
 
         keys = self._types.keys()
         return map(lambda x: (x,x),keys)
 
-
     _columns = {
         'name': fields.char('Level name', size = 64, required = True),
-        'column_name':fields.many2one('olap.database.columns', 'Columns Name', required = True),
+        'column_name': fields.many2one('olap.database.columns', 'Columns Name', required = True),
         'column_id_name': fields.char('Column ID', size = 64, required = True),
         'type': fields.selection(selection = _type_get, string = 'Level class', size = 64, required = True),
         'table_name': fields.char('Table name', size = 64, required = True, \
@@ -1199,8 +1282,8 @@ class olap_level(osv.osv):
 
     _defaults = {
         'column_id_name': lambda * args: 'name',
-        'sequence':lambda * args: '1',
-        'type':lambda * args:'normal',
+        'sequence': lambda * args: '1',
+        'type': lambda * args:'normal',
         'hierarchy_id': _set_hierarchy,
         'name': _set_name
     }
@@ -1214,20 +1297,25 @@ class olap_measure(osv.osv):
     _description = "Olap measure"
 
     def _set_cube(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ set cube for Olap Measure
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('cube_id'):
             return context['cube_id']
         return False
 
     def onchange_measure_name(self, cr, uid, ids, column, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of Olap Measure’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         val = {}
         if not column:
@@ -1236,7 +1324,7 @@ class olap_measure(osv.osv):
         val['table_name'] = col.table_id.table_db_name
         val['value_column_id_name'] = col.column_db_name
         val['name'] = col.column_db_name
-        return {'value':val}
+        return {'value': val}
 
     _columns = {
         'name': fields.char('Measure name', size = 64, required = True),
@@ -1249,7 +1337,7 @@ class olap_measure(osv.osv):
                              ('sql_expr', 'SQL Expression')],\
                              'Measure Type', required = True,\
                              help = "Select between auto column or sql expression for the measures"),
-        'value_sql': fields.char('SQL Expression', size = 200, help = "You can \
+        'value_sql': fields.text('SQL Expression', help = "You can \
                             provide valid sql expression. Make sure it have \
                          function with fully qualified column name like \
                          (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
@@ -1271,7 +1359,7 @@ class olap_measure(osv.osv):
         'datatype': lambda * args: 'float',
         'formatstring': lambda * args: 'none',
         'cube_id': _set_cube,
-        'measure_type':lambda * args:'fact_column',
+        'measure_type': lambda * args:'fact_column',
     }
 
 olap_measure()
@@ -1316,7 +1404,7 @@ class olap_application_field(osv.osv):
     _columns = {
         'name': fields.char('Application field name', size = 64, required = True),
         'table_name': fields.char('Application table name', size = 64),
-        'field_name':fields.char('Field name', size = 64),
+        'field_name': fields.char('Field name', size = 64),
         'is_hidden': fields.boolean('Hidden'),
         'application_id': fields.many2one('olap.application', 'Application Id', required = True),
     }
@@ -1348,10 +1436,12 @@ class bi_load_db_wizard(osv.osv_memory):
     _name = 'bi.load.db.wizard'
 
     def _get_fact_table(self, cr, uid, ctx):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ctx: A standard dictionary for contextual values """
+            @param ctx: A standard dictionary for contextual values
+        """
 
         if ctx and ctx.has_key('active_id'):
             schema_obj = self.pool.get('olap.schema').browse(cr, uid, ctx['active_id'])
@@ -1359,10 +1449,12 @@ class bi_load_db_wizard(osv.osv_memory):
         return False
 
     def _get_db_name(self, cr, uid, ctx):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ctx: A standard dictionary for contextual values """
+            @param ctx: A standard dictionary for contextual values
+        """
 
         if ctx and ctx.has_key('active_id'):
             schema_obj = self.pool.get('olap.schema').browse(cr, uid, ctx['active_id'])
@@ -1370,8 +1462,8 @@ class bi_load_db_wizard(osv.osv_memory):
         return False
 
     _columns = {
-        'fact_table':fields.char('Fact Name' , size = 64, readonly = True),
-        'db_name':fields.char('Database Name', size = 64, readonly = True)
+        'fact_table': fields.char('Fact Name' , size = 64, readonly = True),
+        'db_name': fields.char('Database Name', size = 64, readonly = True)
     }
 
     _defaults = {
@@ -1380,11 +1472,13 @@ class bi_load_db_wizard(osv.osv_memory):
     }
 
     def action_load(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: Load Action’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
@@ -1413,8 +1507,8 @@ class bi_load_db_wizard(osv.osv_memory):
                         INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
                 for table in cr_db.fetchall():
                     val = {
-                        'fact_database_id':id_db,
-                        'table_db_name':table[0]
+                        'fact_database_id': id_db,
+                        'table_db_name': table[0]
                     }
                     if table[0] in tables.keys():
                         table_id = tobj.write(cr, uid, [tables[table[0]]], val, context)
@@ -1480,7 +1574,7 @@ class bi_load_db_wizard(osv.osv_memory):
                 print "Updating the Primary Key Constraint"
                 for constraint in cr_db.fetchall():
                     val = {
-                        'primary_key':True
+                        'primary_key': True
                     }
 
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])), cols)
@@ -1510,7 +1604,7 @@ class bi_load_db_wizard(osv.osv_memory):
 
                 for constraint in cr_db.fetchall():
                     val = {
-                        'related_to':tables[for_key[constraint[2]]]
+                        'related_to': tables[for_key[constraint[2]]]
                     }
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])\
                                                 and (constraint[1] == cols[x][0])), cols)
@@ -1550,8 +1644,8 @@ class bi_load_db_wizard(osv.osv_memory):
 
                 for table in cr_db.fetchall():
                     val = {
-                        'fact_database_id':id_db,
-                        'table_db_name':table[0]
+                        'fact_database_id': id_db,
+                        'table_db_name': table[0]
                     }
 
                     if table[0] in tables.keys():
@@ -1596,12 +1690,12 @@ class bi_load_db_wizard(osv.osv_memory):
 
                     if constraint[0]:
                         val = {
-                             'related_to':tables[constraint[1]]
+                             'related_to': tables[constraint[1]]
                              }
                     else:
 
                         val = {
-                             'primary_key':True
+                             'primary_key': True
                              }
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and \
                                                 (constraint[2] == cols[x][0])), cols)
@@ -1639,8 +1733,8 @@ class bi_load_db_wizard(osv.osv_memory):
                 temp = cr_db.fetchall()
                 for table in temp:
                     val = {
-                        'fact_database_id':id_db,
-                        'table_db_name':table[0]
+                        'fact_database_id': id_db,
+                        'table_db_name': table[0]
                     }
 
                     if table[0] in tables.keys():
@@ -1742,16 +1836,17 @@ class bi_load_db_wizard(osv.osv_memory):
             resource_id = self.pool.get('ir.model.data').read(cr, uid, \
                                     model_data_ids, fields = ['res_id'])[0]['res_id']
 
-            return {'type':'ir.actions.act_window_close' }
+            return {'type': 'ir.actions.act_window_close' }
 
     def action_cancel(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        return {'type':'ir.actions.act_window_close' }
+            @param context: A standard dictionary for contextual values
+        """
+        return {'type': 'ir.actions.act_window_close' }
 
 bi_load_db_wizard()
 # Wizard for the Automatic Application Configuration
@@ -1760,10 +1855,12 @@ class bi_auto_configure_wizard(osv.osv_memory):
     _name = 'bi.auto.configure.wizard'
 
     def _get_name(self, cr, uid, context):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
@@ -1772,20 +1869,21 @@ class bi_auto_configure_wizard(osv.osv_memory):
         return False
 
     _columns = {
-        'name':fields.char('Fact Name' , size = 64, readonly = True),
-
+        'name': fields.char('Fact Name' , size = 64, readonly = True),
         }
 
     _defaults = {
-                   'name':_get_name,
+                   'name': _get_name,
                    }
 
     def action_load(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         vals = {}
         apptabnew_vals = {}
@@ -1931,11 +2029,18 @@ class bi_auto_configure_wizard(osv.osv_memory):
             resource_id = self.pool.get('ir.model.data').read(cr, uid, \
                                 model_data_ids, fields = ['res_id'])[0]['res_id']
 
-            return {'type':'ir.actions.act_window_close' }
+            return {'type': 'ir.actions.act_window_close' }
 
     def action_cancel(self, cr, uid, ids, context = None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
-        return {'type':'ir.actions.act_window_close' }
+        return {'type': 'ir.actions.act_window_close' }
 
 bi_auto_configure_wizard()
 
@@ -1947,10 +2052,12 @@ class olap_warehouse_wizard(osv.osv_memory):
     _description = "Olap Warehouse"
 
     def _get_queries(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         query_obj = self.pool.get('olap.query.logs')
         qry_ids = query_obj.search(cr, uid, [('user_id', '=', uid), ('count', '>=', 3)])
@@ -1967,20 +2074,23 @@ class olap_warehouse_wizard(osv.osv_memory):
         else:
             return ''
     def action_ok(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Action’s IDs
-            @param context: A standard dictionary for contextual values """
-        return {'type':'ir.actions.act_window_close' }
+            @param context: A standard dictionary for contextual values
+        """
+        return {'type': 'ir.actions.act_window_close' }
 
     _columns = {
-                'query':fields.text('Query', readonly=True),
+                'query': fields.text('Query', readonly=True),
                 }
 
     _defaults = {
         'query': _get_queries,
         }
+
 olap_warehouse_wizard()
 
 
@@ -1990,11 +2100,12 @@ class olap_parameters_config_wizard(osv.osv_memory):
     _description = "Olap Server Parameters"
 
     def _get_host(self, cr, uid, context = None):
-
         """ Get Host ID
+            @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
@@ -2008,11 +2119,12 @@ class olap_parameters_config_wizard(osv.osv_memory):
         return s_p.parseString(aid.url)[0]
 
     def _get_port(self, cr, uid, context = None):
-
         """ Get Port
+            @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
@@ -2026,9 +2138,9 @@ class olap_parameters_config_wizard(osv.osv_memory):
         return s_p.parseString(aid.url)[1]
 
     _columns = {
-        'host_name' : fields.char('Server Name', size = 64, help = "Put here the server address or IP \
+        'host_name': fields.char('Server Name', size = 64, help = "Put here the server address or IP \
                 Put localhost if its not clear.", required = True),
-        'host_port' : fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
+        'host_port': fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
                 its not clear.", required = True),
             }
 
@@ -2038,11 +2150,13 @@ class olap_parameters_config_wizard(osv.osv_memory):
         }
 
     def action_cancel(self, cr, uid, ids, conect = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of olap parameter’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         return {
                 'view_type': 'form',
@@ -2053,11 +2167,13 @@ class olap_parameters_config_wizard(osv.osv_memory):
          }
 
     def action_config(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         conf = self.browse(cr, uid, ids[0], context)
         obj = self.pool.get('olap')
diff --git a/addons/olap_crm/__terp__.py b/addons/olap_crm/__openerp__.py
similarity index 100%
rename from addons/olap_crm/__terp__.py
rename to addons/olap_crm/__openerp__.py
diff --git a/addons/olap_extract/__terp__.py b/addons/olap_extract/__openerp__.py
similarity index 100%
rename from addons/olap_extract/__terp__.py
rename to addons/olap_extract/__openerp__.py
diff --git a/addons/olap_sale/__terp__.py b/addons/olap_sale/__openerp__.py
similarity index 100%
rename from addons/olap_sale/__terp__.py
rename to addons/olap_sale/__openerp__.py
diff --git a/addons/olap_sale/i18n/de.po b/addons/olap_sale/i18n/de.po
new file mode 100644
index 00000000000..0abfadcba34
--- /dev/null
+++ b/addons/olap_sale/i18n/de.po
@@ -0,0 +1,31 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-04-17 19:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
diff --git a/addons/olap_sale/i18n/ro.po b/addons/olap_sale/i18n/ro.po
index a3d1fabb45d..b1d8ecc3b86 100644
--- a/addons/olap_sale/i18n/ro.po
+++ b/addons/olap_sale/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/partner_crm/__terp__.py b/addons/partner_crm/__openerp__.py
similarity index 100%
rename from addons/partner_crm/__terp__.py
rename to addons/partner_crm/__openerp__.py
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__openerp__.py
similarity index 100%
rename from addons/point_of_sale/__terp__.py
rename to addons/point_of_sale/__openerp__.py
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 4dfa959caf9..c0fc20de128 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -50,7 +50,7 @@
                             <group colspan="4" col="9" groups="base.group_extended">
                             <separator colspan="4" string="Validation of the Sale"/>
                                 <newline/>
-                                <field name="state_2" select="2" />
+                                <field name="state_2" />
                                 <button name="button_validate"
                                         string="Accept"
                                         type="object"
@@ -257,8 +257,8 @@ invoiced
                 <form string="POS Order line">
                     <field name="product_id"  select="1"/>
                     <field name="qty"  select="1"/>
-                    <field name="discount"  select="2"/>
-                    <field name="price_unit"  select="2"/>
+                    <field name="discount" />
+                    <field name="price_unit" />
                     <field name="create_date"  select="1"/>
                 </form>
             </field>
@@ -306,9 +306,9 @@ invoiced
                     <field name="journal_id" select="1"/>
                     <field name="jl_id" select="1"/>
                     <field name="date_create" select="1" widget="date"/>
-                    <field name="no_trans" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="invoice_id" select="2"/>
+                    <field name="no_trans"/>
+                    <field name="amount"/>
+                    <field name="invoice_id"/>
                 </form>
             </field>
         </record>
@@ -394,9 +394,9 @@ invoiced
             <field name="arch" type="xml">
                 <form string="POS ">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </form>
             </field>
         </record>
@@ -409,9 +409,9 @@ invoiced
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -423,7 +423,7 @@ invoiced
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="POS Report">
-                    <field name="qty" select="2"/>
+                    <field name="qty"/>
                     <field name="amount" />
                 </calendar>
             </field>
@@ -460,9 +460,9 @@ invoiced
             <field name="arch" type="xml">
                 <form string="POS ">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </form>
             </field>
         </record>
@@ -475,9 +475,9 @@ invoiced
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -489,7 +489,7 @@ invoiced
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="POS Report">
-                    <field name="qty" select="2"/>
+                    <field name="qty"/>
                     <field name="amount" />
                 </calendar>
             </field>
@@ -525,12 +525,12 @@ invoiced
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="user_id" select="2"/>
-                    <field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </form>
             </field>
         </record>
@@ -542,12 +542,12 @@ invoiced
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
-                    <field name="user_id" select="2"/>
-                    <field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </tree>
             </field>
         </record>
@@ -559,7 +559,7 @@ invoiced
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
-                    <field name="product_name" select="2"/>
+                    <field name="product_name"/>
                     <field name="total" />
                 </calendar>
             </field>
@@ -592,12 +592,12 @@ invoiced
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                    <field name="user_id" select="2"/>
-                    <field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </form>
             </field>
         </record>
@@ -609,12 +609,12 @@ invoiced
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
-                    <field name="user_id" select="2"/>
-                    <field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </tree>
             </field>
         </record>
@@ -626,7 +626,7 @@ invoiced
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
-                    <field name="product_name" select="2"/>
+                    <field name="product_name"/>
                     <field name="total" />
                 </calendar>
             </field>
@@ -677,7 +677,7 @@ invoiced
             <field name="arch" type="xml">
              <form string="Contact Mode">
                     <field  name="name" select="1"/>
-                    <field  name="active" select="2"/>
+                    <field  name="active"/>
               </form>
             </field>
           </record>
@@ -741,12 +741,12 @@ invoiced
                     <group colspan="4" col="2">
                         <separator string="Product Description" colspan="4"/>
                         <field name="name" select="1"  />
-                        <field groups="base.group_extended" name="variants" select="2" />
+                        <field groups="base.group_extended" name="variants" />
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Codes" colspan="2"/>
                         <field name="default_code" select="1"/>
-                        <field groups="base.group_extended" name="ean13" select="2"/>
+                        <field groups="base.group_extended" name="ean13"/>
                     </group>
 
                    </group>
@@ -756,7 +756,7 @@ invoiced
                             <separator string="Product Type" colspan="2"/>
                               <field name="categ_id" select="1"/>
                               <field name="property_account_income" select="1" string="Account" required="1"/>
-                              <field name="type" select="2"/>
+                              <field name="type"/>
                             </group>
                             <group colspan="2" col="2" name="Miscelleanous">
                               <separator string="Miscelleanous" colspan="2"/>
@@ -764,7 +764,7 @@ invoiced
                                   <field name="expense_pdt"/>
                             <field name="am_out"/>
                           <field name="disc_controle"/>
-                                  <field name="company_id" select="2" groups="base.group_extended"/>
+                                  <field name="company_id" groups="base.group_extended"/>
                               </group>
                               <group colspan="2" col="2" name="Prices">
                                   <separator string="Prices" colspan="2"/>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 19e7bdc13e3..0dcba67b8b3 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -102,7 +102,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2" colspan="4"/>
+                        <field name="state" colspan="4"/>
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
@@ -165,7 +165,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2" colspan="4"/>
+                        <field name="state" colspan="4"/>
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
@@ -294,7 +294,7 @@
                     </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2" colspan="4"/>
+                        <field name="state" colspan="4"/>
                         <field name="total_entry_encoding"/>
                       </group>
                       <group colspan="4">
diff --git a/addons/process/__terp__.py b/addons/process/__openerp__.py
similarity index 100%
rename from addons/process/__terp__.py
rename to addons/process/__openerp__.py
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 45f3cac0c3d..5784a92ff20 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -16,7 +16,7 @@
             <form string="Process">
                 <group colspan="4" string="Details">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active"/>
                     <field name="model_id" select="1"/>
                 </group>
                 <notebook colspan="4">
@@ -35,7 +35,7 @@
                                     <field name="process_id" readonly="1" required="0"/> <!-- used by transition_out -->
                                     <newline/>
                                     <field name="model_id" select="1"/>
-                                    <field name="menu_id" select="2"/>                                    
+                                    <field name="menu_id"/>
                                     <newline/>
                                     <field name="kind" select="1"/>
                                     <field name="help_url" widget="url"/>
@@ -68,7 +68,7 @@
                                                                 <newline/>
                                                                 <field name="state"/>
                                                                 <field name="action"/>
-                                                            </form>               
+                                                            </form>
                                                         </field>
                                                     </page>
                                                     <page string="Roles Required">
@@ -145,8 +145,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Process Nodes">
-                <field name="name"/>      
-                <field name="process_id" select="1"/>          
+                <field name="name"/>
+                <field name="process_id" select="1"/>
                 <field name="model_id" select="1"/>
                 <field name="kind" select="1"/>
                 <field name="flow_start"/>
@@ -162,11 +162,11 @@
             <form string="Process Node">
                 <group colspan="4" string="Details">
                     <field name="name" select="1"/>
-                    <field name="flow_start"/>                                    
+                    <field name="flow_start"/>
                     <field name="process_id"/>
-                    <newline/>                                    
+                    <newline/>
                     <field name="model_id" select="1"/>
-                    <field name="menu_id" select="2"/>                                    
+                    <field name="menu_id"/>
                     <newline/>
                     <field name="kind" select="1"/>
                     <field name="help_url" widget="url"/>
@@ -199,7 +199,7 @@
                                                 <newline/>
                                                 <field name="state"/>
                                                 <field name="action"/>
-                                            </form>               
+                                            </form>
                                         </field>
                                     </page>
                                     <page string="Roles Required">
@@ -234,7 +234,7 @@
                         <field name="note" nolabel="1" colspan="4"/>
                     </page>
                 </notebook>
-            </form>                                
+            </form>
         </field>
     </record>
 
diff --git a/addons/product/__terp__.py b/addons/product/__openerp__.py
similarity index 100%
rename from addons/product/__terp__.py
rename to addons/product/__openerp__.py
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 1864c3e9166..0d4685593c3 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -14,7 +14,7 @@
             <field name="arch" type="xml">
                 <form string="Pricelist Version">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active"/>
                     <field colspan="4" name="pricelist_id" select="1"/>
                     <field name="date_start" select="1"/>
                     <field name="date_end" select="1"/>
@@ -127,7 +127,7 @@
                     <field colspan="4" name="version_id" nolabel="1">
                         <form string="Pricelist Version">
                             <field name="name" select="1"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="date_start" select="1"/>
                             <field name="date_end" select="1"/>
                             <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
diff --git a/addons/product/product.py b/addons/product/product.py
index 6c3d7ef17b5..b21ebe5ee3a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -271,7 +271,7 @@ class product_template(osv.osv):
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
             help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
         'warranty': fields.float('Warranty (months)'),
-        'sale_ok': fields.boolean('Can be sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
+        'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
         'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
@@ -648,7 +648,7 @@ class product_supplierinfo(osv.osv):
         'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
         'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
         'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
-        'sequence' : fields.integer('Priority', help="Assigns the priority to the list of product supplier."),
+        'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
         'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d64d192b148..131b88f24a1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -42,7 +42,7 @@
                 <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
                     <field name="default_code"/>
                     <field name="name"/>
-                    <field name="categ_id" />
+                    <field name="categ_id" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id"/>
                     <field name="type"/>
@@ -66,18 +66,18 @@
                     <group colspan="4" col="2">
                         <separator string="Product Description" colspan="4"/>
                         <field name="name" select="1"  />
-                        <field groups="product.group_product_variant" name="variants" select="2" />
+                        <field groups="product.group_product_variant" name="variants" />
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Codes" colspan="2"/>
                         <field name="default_code" select="1"/>
-                        <field groups="base.group_extended" name="ean13" select="2"/>
+                        <field name="ean13" groups="base.group_extended"/>
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Product Characteristics" colspan="2"/>
-                        <field name="sale_ok" select="2"/>
-                        <field name="purchase_ok" select="2"/>
-                        <field groups="base.group_extended" name="rental" select="2"/>
+                        <field name="sale_ok"/>
+                        <field name="purchase_ok"/>
+                        <field groups="base.group_extended" name="rental"/>
                     </group>
                    </group>
 
@@ -85,7 +85,7 @@
                         <page string="Information">
                             <group colspan="2" col="2">
                                 <separator string="Procurement" colspan="2"/>
-                                <field name="type" select="2"/>
+                                <field name="type"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
                             </group>
@@ -100,8 +100,8 @@
                             <group colspan="2" col="2" name="status">
                                 <separator string="Status" colspan="2"/>
                                 <field name="categ_id" select="1"/>
-                                <field name="state" select="2"/>
-                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                                <field name="state"/>
+                                <field groups="base.group_extended" name="product_manager"/>
                             </group>
 
                             <group colspan="2" col="2" name="uom">
@@ -132,10 +132,10 @@
                                 <field name="loc_case"/>
                             </group>
 
-                            <group colspan="2" col="2" name="misc">
+                            <group colspan="2" col="2" name="misc" groups="base.group_extended">
                                 <separator string="Miscellaneous" colspan="2"/>
-                                <field name="active" select="2"/>
-                                <field name="company_id" select="2" groups="base.group_multi_company" widget="selection"/>
+                                <field name="active"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
                         </page>
@@ -163,7 +163,7 @@
                             <field colspan="4" name="packaging" nolabel="1">
                                 <form string="Packaging">
                                     <field name="ean" select="1"/>
-                                    <field name="sequence"/>
+                                    <field name="sequence" invisible="1"/>
                                     <newline/>
                                     <field name="qty" select="1"/>
                                     <field name="ul"/>
@@ -215,7 +215,7 @@
                 <form string="Product Categories">
                     <field name="name" select="1"/>
                     <field name="parent_id"/>
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="type"/>
                     <newline/>
                 </form>
@@ -383,7 +383,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
@@ -400,7 +400,7 @@
                     <field name="product_id" select="1"/>
                     <newline/>
                     <field name="ean" select="1"/>
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <newline/>
                     <field name="qty" select="1"/>
                     <field name="ul"/>
@@ -426,7 +426,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier Information">
                     <field name="name"/>
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="product_name" groups="base.group_extended"/>
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="delay"/>
@@ -451,7 +451,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" string="Seq" invisible="1"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="qty"/>
@@ -519,15 +519,15 @@
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Product Type" colspan="2"/>
-                        <field name="sale_ok" select="2"/>
-                        <field name="purchase_ok" select="2"/>
-                        <field groups="base.group_extended" name="rental" select="2"/>
+                        <field name="sale_ok"/>
+                        <field name="purchase_ok"/>
+                        <field groups="base.group_extended" name="rental"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
                                 <separator string="Procurement" colspan="2"/>
-                                <field name="type" select="2"/>
+                                <field name="type"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
                             </group>
@@ -542,8 +542,8 @@
                             <group colspan="2" col="2" name="status">
                                 <separator string="Status" colspan="2"/>
                                 <field name="categ_id" select="1"/>
-                                <field name="state" select="2"/>
-                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                                <field name="state"/>
+                                <field groups="base.group_extended" name="product_manager"/>
                             </group>
 
                             <group colspan="2" col="2" name="uom">
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__openerp__.py
similarity index 100%
rename from addons/product_margin/__terp__.py
rename to addons/product_margin/__openerp__.py
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__openerp__.py
similarity index 100%
rename from addons/profile_accounting/__terp__.py
rename to addons/profile_accounting/__openerp__.py
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__openerp__.py
similarity index 100%
rename from addons/profile_manufacturing/__terp__.py
rename to addons/profile_manufacturing/__openerp__.py
diff --git a/addons/profile_manufacturing/i18n/nl.po b/addons/profile_manufacturing/i18n/nl.po
index ee90ed707e2..f3c782fdd92 100644
--- a/addons/profile_manufacturing/i18n/nl.po
+++ b/addons/profile_manufacturing/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_tools/__terp__.py b/addons/profile_tools/__openerp__.py
similarity index 100%
rename from addons/profile_tools/__terp__.py
rename to addons/profile_tools/__openerp__.py
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index 83fdea9261d..cbe327502b0 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cc1567afdcb..86f10e46b97 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -25,7 +25,7 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Scheduling"/>
                                 <field name="priority"/>
-                                <field name="active" select="2"/>
+                                <field name="active"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Performance"/>
@@ -57,7 +57,7 @@
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" select="2"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>
@@ -234,7 +234,7 @@
                         <field name="name" select="1"/>
                         <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                         <field name="total_hours" widget="float_time"/>
-                        <field name="date_deadline" select="2"/>
+                        <field name="date_deadline"/>
                         <field name="user_id" select="1"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
@@ -246,7 +246,7 @@
                                 widget="float_time"
                                 attrs="{'readonly':[('state','!=','draft')]}"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
                                 <button name="%(action_config_compute_remaining)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
                             <group col="2" colspan="2">
@@ -254,7 +254,7 @@
                             <field name="effective_hours" widget="float_time"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
+                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
@@ -304,14 +304,14 @@
                                 <field name="date_end"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="partner_id" select="2"/>
+                            <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
                                 <field name="type" widget="selection" />
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                                 <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                             </group>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
@@ -571,7 +571,7 @@
                         <field name="subject" select="1"/>
                         <field name="project_id"/>
                         <field name="user_id" select="1"/>
-                          <field name="date" select="2"/>
+                          <field name="date"/>
                      </group>
                         <separator string="Description"  colspan="4"/>
                         <field name="description"  nolabel="1" colspan="4"/>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 6e43f96b1ab..b4ee058433a 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -90,7 +90,7 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
-                <field name="context_id" select="2" widget="selection" groups="project_gtd.group_project_getting"/>
+                <field name="context_id" widget="selection" groups="project_gtd.group_project_getting"/>
                 <field name="timebox_id" select="1" groups="project_gtd.group_project_getting"/>
             </field>
         </field>
diff --git a/addons/project_issue/__init__.py b/addons/project_issue/__init__.py
new file mode 100755
index 00000000000..c51b756f4ca
--- /dev/null
+++ b/addons/project_issue/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import project_issue
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/project_issue/__openerp__.py
old mode 100644
new mode 100755
similarity index 54%
rename from addons/wiki/wizard/wiki_wiki_help_open.py
rename to addons/project_issue/__openerp__.py
index 1333f80b96f..2bf67d47191
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/project_issue/__openerp__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -20,35 +20,33 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-
-class wiki_wiki_help_open(osv.osv_memory):
-    """ Basic Wiki Editing """
-    _name = "wiki.wiki.help.open"
-    _description = "Basic Wiki Editing"
-
-    def open_wiki_page(self, cr, uid, ids, context):
-
-        """ Opens Wiki Page for Editing
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of wiki page’s IDs
-
-        """
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
-
-        value = {
-            'view_type': 'form', 
-            'view_mode': 'form,tree', 
-            'res_model': 'wiki.wiki', 
-            'view_id': False, 
-            'res_id': pages[0], 
-            'type': 'ir.actions.act_window', 
-        }
-
-        return value
-
-wiki_wiki_help_open()
 
+{
+    'name': 'Issue Management in Project Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """
+        This module provide Issues/Bugs Management in Project
+    """,
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': [
+        'crm',
+        'project',
+        'hr_timesheet_sheet',
+    ],
+    'init_xml': [
+        'project_issue_data.xml'
+    ],
+    'update_xml': [
+        'project_issue_view.xml',
+        'project_issue_menu.xml',
+        'report/project_issue_report_view.xml',
+        'security/project_issue_security.xml',
+        'security/ir.model.access.csv',
+     ],
+    'demo_xml': ['project_issue_demo.xml'],
+    'installable': True,
+    'active': False,
+}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
new file mode 100755
index 00000000000..3f35913ae75
--- /dev/null
+++ b/addons/project_issue/project_issue.py
@@ -0,0 +1,243 @@
+ #-*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import base64
+import os
+import re
+import time
+import mx.DateTime
+from datetime import datetime, timedelta
+
+import tools
+from crm import crm
+from osv import fields,osv,orm
+from osv.orm import except_orm
+from tools.translate import _
+
+class project_issue(osv.osv):
+    _name = "project.issue"
+    _description = "Project Issue"
+    _order = "priority, id desc"
+    _inherit = 'crm.case'
+
+    def case_open(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
+        res = super(project_issue, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
+
+    def _compute_day(self, cr, uid, ids, fields, args, context={}):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Openday’s IDs
+        @return: difference between current date and log date
+        @param context: A standard dictionary for contextual values
+        """
+        cal_obj = self.pool.get('resource.calendar')
+        res_obj = self.pool.get('resource.resource')
+
+        res = {}
+        for issue in self.browse(cr, uid, ids , context):
+            for field in fields:
+                res[issue.id] = {}
+                duration = 0
+                ans = False
+                if field == 'day_open':
+                    if issue.date_open:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
+                        ans = date_open - date_create
+                        date_until = issue.date_open
+                elif field == 'day_close':
+                    if issue.date_closed:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
+                        date_until = issue.date_closed
+                        ans = date_close - date_create
+                if ans:
+                    resource_id = False
+                    if issue.user_id:
+                        resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)])
+                        resource_id = len(resource_ids) or resource_ids[0]
+
+                    duration = float(ans.days)
+                    if issue.section_id.resource_calendar_id:
+                        duration =  float(ans.days) * 24
+                        new_dates = cal_obj.interval_get(cr,
+                            uid,
+                            issue.section_id.resource_calendar_id and issue.section_id.resource_calendar_id.id or False,
+                            mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+                            duration,
+                            resource=resource_id
+                        )
+                        no_days = []
+                        date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
+                        for in_time, out_time in new_dates:
+                            if in_time.date not in no_days:
+                                no_days.append(in_time.date)
+                            if out_time > date_until:
+                                break
+                        duration =  len(no_days)
+                res[issue.id][field] = abs(int(duration))
+        return res
+
+    _columns = {
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date': fields.datetime('Date'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'partner_name': fields.char("Employee's Name", size=64),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'duration': fields.float('Duration'),
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
+        'date_open': fields.datetime('Opened', readonly=True),
+        'day_open': fields.function(_compute_day, string='Days to Open', \
+                                method=True, multi='day_open', type="integer", store=True),
+        'day_close': fields.function(_compute_day, string='Days to Close', \
+                                method=True, multi='day_close', type="integer", store=True),
+        'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
+                                                domain="[('partner_id', '=', partner_id)]",
+                                                required=True),
+    }
+
+    def _get_project(self, cr, uid, context):
+       user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
+       if user.context_project_id:
+           return user.context_project_id
+       return False
+
+    def convert_issue_task(self, cr, uid, ids, context=None):
+        case_obj = self.pool.get('project.issue')
+        data_obj = self.pool.get('ir.model.data')
+        task_obj = self.pool.get('project.task')
+
+        if context is None:
+            context = {}
+
+#        for case in case_obj.browse(cr, uid, ids, context=context):
+#            if case.state != 'open':
+#                raise osv.except_osv(_('Warning !'),
+#                    _('Issues or Feature Requests should be in \'Open\' state before converting into Task.'))
+
+        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for bug in case_obj.browse(cr, uid, ids, context=context):
+            new_task_id = task_obj.create(cr, uid, {
+                'name': bug.name,
+                'partner_id': bug.partner_id.id,
+                'description':bug.description,
+                'date': bug.date,
+                'project_id':bug.project_id.id,
+                'priority':bug.priority,
+                'user_id':bug.user_id.id,
+                'planned_hours': 0.0,
+            })
+
+            new_task = task_obj.browse(cr, uid, new_task_id)
+
+            vals = {
+                'task_id': new_task_id,
+                }
+            case_obj.write(cr, uid, [bug.id], vals)
+
+        return  {
+            'name': _('Tasks'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'project.task',
+            'res_id': int(new_task_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'],
+            'nodestroy': True
+        }
+
+    def _convert(self, cr, uid, ids, xml_id, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
+        categ_id = False
+        if id2:
+            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
+        if categ_id:
+            self.write(cr, uid, ids, {'categ_id': categ_id})
+        return True
+
+    def convert_to_feature(self, cr, uid, ids, context=None):
+        return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
+
+    def convert_to_bug(self, cr, uid, ids, context=None):
+        return self._convert(cr, uid, ids, 'bug_categ', context=context)
+
+    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+        if not stage_id:
+            return {'value':{}}
+        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+        if not stage.on_change:
+            return {'value':{}}
+        return {'value':{}}
+
+    _defaults = {
+        'project_id':_get_project,
+    }
+
+project_issue()
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _columns = {
+        'create_date' : fields.datetime('Create Date', readonly=True),
+    }
+
+account_analytic_line()
+
+class hr_analytic_issue(osv.osv):
+    _inherit = 'hr.analytic.timesheet'
+
+    _columns = {
+        'issue_id' : fields.many2one('project.issue', 'Issue'),
+    }
+
+hr_analytic_issue()
+
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
new file mode 100755
index 00000000000..a87039274f3
--- /dev/null
+++ b/addons/project_issue/project_issue_data.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+    <!--
+    Case Categories
+    -->
+         <!--    For Bugs    -->
+         
+    <record model="crm.case.categ" id="bug_categ">
+        <field name="name">Bugs</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.categ" id="feature_request_categ">
+        <field name="name">Feature Requests</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+    </record>
+
+    <!--
+    Case type_id
+    -->
+         <!--    For Bugs    -->
+    <record model="crm.case.resource.type" id="type1">
+        <field name="name">Version 4.2</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+    </record>    
+    <record model="crm.case.resource.type" id="type2">
+        <field name="name">Version 4.4</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
+    </record>
+
+    <!--
+    Case Stage
+    -->
+         <!--    For Bugs    -->
+         
+    <record model="crm.case.stage" id="stage1">
+        <field name="name">Accepted as Bug</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage2">
+        <field name="name">Fixed</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage3">
+        <field name="name">Won't fix</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage4">
+        <field name="name">Invalid</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage5">
+        <field name="name">Awaiting Response</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>    
+    <record model="crm.case.stage" id="stage6">
+        <field name="name">Works For Me</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
+    </record>
+</data>
+</openerp>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
new file mode 100755
index 00000000000..8794992b440
--- /dev/null
+++ b/addons/project_issue/project_issue_demo.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	<!--
+		((((((((((( Demo Cases )))))))))))
+	-->
+<!--For Issue Tracking-->
+	<record id="crm_case_buginaccountsmodule0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_8"/>
+		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;5&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage1"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field name="analytic_account_id" ref="account.analytic_agrolait"/>
+		<field eval="15.0" name="duration"/>
+		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
+		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
+	</record>
+	<record id="crm_case_log_takecorrectiveactions0" model="crm.case.log">
+		<field eval="time.strftime('%Y-%m-08')" name="date"/>
+		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
+		<field name="som" ref="base.som_normal"/>
+		<field eval="&quot;Take corrective actions&quot;" name="name"/>
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
+	</record>
+
+	<record id="crm_case_programnotgivingproperoutput0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
+		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="3.5" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage2"/>
+		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
+		<field name="project_id" ref="project.project_project_22"/>
+	</record>
+
+	<record id="crm_case_outputincorrect0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="account.analytic_project_1"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.3" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage3"/>
+		<field name="project_id" ref="project.project_project_23"/>
+		<field eval="&quot;Output incorrect&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_problemloadingpage0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_13"/>
+		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_14"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage4"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Problem loading page&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_pagenotfound0" model="project.issue">
+		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+		<field name="analytic_account_id" ref="account.analytic_desertic_hispafuentes"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="1.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Page not Found&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_programmingerror0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_10"/>
+		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage6"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Programming Error&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_logicalerrorinprogram0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage6"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_constrainterror0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="7.3" name="duration"/>
+		<field name="categ_id" ref="bug_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Constraint Error&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_errorinprogram0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_10"/>
+		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field eval="1" name="active"/>
+		<field eval="1.3" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_patcheserrorinprogram0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_2"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="13.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_newfeaturestobeadded0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_maxtor"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="3.2" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage1"/>
+		<field name="project_id" ref="project.project_project_21"/>
+		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_addmenustothemodule0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_1"/>
+		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
+		<field name="type_id" ref="type2"/>
+		<field eval="&quot;1&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_9"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="3.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage2"/>
+		<field name="project_id" ref="project.project_project_21"/>
+		<field eval="&quot;Add menus to the module&quot;" name="name"/>
+		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+	</record>
+
+	<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_2"/>
+		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_10"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage3"/>
+		<field name="project_id" ref="project.project_project_9"/>
+		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
+		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+	</record>
+
+	<record id="crm_case_createnewobject0" model="project.issue">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field name="som" ref="base.som_happy"/>
+		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="2.45" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Create new object&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_improvereportsinhrms0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_15"/>
+		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="15.0" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage6"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_improvereportsinpms0" model="project.issue">
+		<field name="partner_address_id" ref="base.res_partner_address_15"/>
+		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
+		<field name="type_id" ref="type1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
+		<field eval="1" name="active"/>
+		<field eval="06.15" name="duration"/>
+		<field name="categ_id" ref="feature_request_categ"/>
+		<field name="stage_id" ref="stage5"/>
+		<field name="project_id" ref="project.project_project_22"/>
+		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
+	</record>
+
+</data>
+</openerp>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
new file mode 100755
index 00000000000..1fc5c3bce7d
--- /dev/null
+++ b/addons/project_issue/project_issue_menu.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+
+
+    ######################## ISSUE TRACKING (menu) ###########################
+    <!--
+        ALL BUGS
+    -->
+    <record model="ir.actions.act_window" id="project_issue_categ_act0">
+        <field name="name">Issues</field>
+        <field name="res_model">project.issue</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,calendar</field>
+        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
+        <field name="context">{"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
+        <field name="search_view_id" ref="view_project_issue_filter"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="project_issue_calendar_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="project_issue_form_view"/>
+        <field name="act_window_id" ref="project_issue_categ_act0"/>
+    </record>
+
+    <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
+    <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management" action="project_issue_categ_act0"/>
+</data>
+</openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
new file mode 100755
index 00000000000..343005d25d7
--- /dev/null
+++ b/addons/project_issue/project_issue_view.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="project_issue_categ_action" model="ir.actions.act_window">
+            <field name="name">Issue Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+            <field name="context">{'object_id':'project.issue'}</field>
+        </record>
+
+        <record id="project_issue_stage_act" model="ir.actions.act_window">
+            <field name="name">Issue Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_stage_tree"/>
+            <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+            <field name="context">{'object_id':'project.issue'}</field>
+        </record>
+        <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
+
+        <record model="ir.ui.view" id="project_issue_form_view">
+            <field name="name">Project Issue Tracker Form</field>
+            <field name="model">project.issue</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Issue Tracker Form">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="user_id"/>
+                        <field name="assigned_to" />
+                        <group colspan="2" col="4">
+                            <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection"/>
+                            <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
+                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        </group>
+                        <field name="project_id" required="True"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="General">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Communication"/>
+                                <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
+                                <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
+                                <field name="email_from"/>
+                                <field name="analytic_account_id" />
+                            </group>
+                            <group col="3" colspan="2">
+                                <separator colspan="3" string="Status"/>
+                                <field name="type_id" colspan="3"/>
+                                <field name="priority" colspan="3"/>
+                                <field name="task_id" />
+                                <button string="Convert To Task"
+                                    name="convert_issue_task"
+                                    icon="gtk-index" type="object"
+                                    attrs="{'invisible':[('task_id','!=',False)]}" />
+                            </group>
+                            <separator string= "Description" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="4"/>
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state" />
+                                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Date"/>
+                                <field name="create_date"/>
+                                <field name="write_date" />
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group colspan="2" col="2">
+                        		<separator string="Statistics" colspan="2" col="2"/>
+                        		<field name="day_open"/>
+                        		<field name="day_close"/>
+                    		</group>
+                            <group col="2" colspan="2">
+                                <separator string="References" colspan="2"/>
+                                <field name="id"/>
+                                <field name="active"/>
+                            </group>
+                            <field name="log_ids" nolabel="1" colspan="4">
+                                <form string="Actions">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date" />
+                                    <field name="user_id" />
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
+                            </group>
+                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                                <form string="Communication history">
+                                    <group col="7" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                        <button
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(crm.action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'project.issue'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(crm.action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'project.issue'}"
+                           	icon="gtk-go-forward" type="action" />
+                        </page>
+                        <page string="Worklogs">
+                            <separator string="Timesheets" colspan="4" />
+                            <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                                <tree editable="top" string="Timesheet">
+                                    <field name="create_date" string="Date" />
+                                    <field name="user_id" readonly="1" />
+                                    <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                    <field name="name"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+
+                                    <field invisible="1" name="journal_id"/>
+                                    <field invisible="1" name="product_id"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field invisible="1" name="amount"/>
+                                    <field invisible="1" name="general_account_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="project_issue_tree_view">
+            <field name="name">Project Issue Tracker Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="id"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="priority" string="Severity"/>
+                    <field name="stage_id" string="Resolution"/>
+                    <button icon="gtk-go-back" string=""
+                        name="stage_previous" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <button icon="gtk-go-forward" string=""
+                        name="stage_next" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <field name="type_id" string="Version"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_issue_filter" model="ir.ui.view">
+            <field name="name">Project Issue Tracker Search</field>
+            <field name="model">project.issue</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Issue Tracker Search">
+                    <group>
+                        <filter icon="gtk-home" string="   Today   "
+                            separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                            help="Todays's bugs"
+                            />
+                        <filter icon="gtk-media-rewind"
+                            string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Bugs during last 7 days"
+                            />
+
+                    </group>
+                    <separator orientation="vertical"/>
+                    <group>
+                        <field name="name" select='1' string="Subject"/>
+                        <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" name="my_bugs"/>
+                        </field>
+                        <field name="state" select="1">
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
+                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project">
+                            <filter icon="terp-crm"
+                                domain="[('project_id','=',context.get('project_id',False))]"
+                                help="My Project"
+                                />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="16">
+	                    <filter string="Stage" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'stage_id'}" />
+	                    <filter string="Priority" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'priority'}" />
+	                    <filter string="Campaign" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'type_id'}" />
+	                    <separator orientation="vertical" />
+	                    <filter string="Partner" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'partner_id'}" />
+	                    <filter string="Salesman" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'user_id'}" />
+	                    <separator orientation="vertical" />
+                	</group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_issue_calendar_view">
+            <field name="name">Project Issue Tracker Calendar</field>
+            <field name="model">project.issue</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                </calendar>
+            </field>
+        </record>
+
+        # ------------------------------------------------------
+        # Feature Requests
+        # ------------------------------------------------------
+
+        <record model="ir.ui.view" id="project_feature_tree_view">
+            <field name="name">Project Issue- Feature Tracker Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Feature Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="id"/>
+                    <field name="name" string="Feature description"/>
+                    <field name="partner_id"/>
+                    <field name="priority" string="Severity"/>
+                    <field name="stage_id" string="Resolution"/>
+                    <button icon="gtk-go-back" string=""
+                        name="stage_previous" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <button icon="gtk-go-forward" string=""
+                        name="stage_next" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <field name="type_id" string="Version"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_feature_filter" model="ir.ui.view">
+            <field name="name">Project Issue- Feature Tracker Search</field>
+            <field name="model">project.issue</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Feature Tracker Search">
+                    <group>
+                        <filter icon="gtk-home" string="   Today   "
+                            separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                            help="Todays's features"
+                            />
+                        <filter icon="gtk-media-rewind"
+                            string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Features during last 7 days"
+                            />
+                    </group>
+                    <separator orientation="vertical"/>
+                    <group>
+                        <field name="name" select='1' string="Feature description"/>
+                        <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" name="my_feature"/>
+                        </field>
+                        <field name="state" select="1">
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project">
+                            <filter icon="terp-crm"
+                                domain="[('project_id','=',context.get('project_id',False))]"
+                                help="My Project"
+                                />
+                        </field>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/project_issue/report/__init__.py b/addons/project_issue/report/__init__.py
new file mode 100755
index 00000000000..9fe3b084477
--- /dev/null
+++ b/addons/project_issue/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import project_issue_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
new file mode 100755
index 00000000000..ef1e002ae78
--- /dev/null
+++ b/addons/project_issue/report/project_issue_report.py
@@ -0,0 +1,52 @@
+from osv import fields,osv
+import tools
+from crm import crm
+
+class project_issue_report(osv.osv):
+    _name = "project.issue.report"
+    _auto = False
+    _inherit = "crm.case.report"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),
+        'nbr': fields.integer('# of Issues', reaadonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'company_id' : fields.many2one('res.company', 'Company'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
+        'date_closed': fields.datetime('Close Date', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'project_issue_report')
+        cr.execute("""
+            create or replace view project_issue_report as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    c.categ_id,
+                    c.stage_id,
+                    to_char(c.date_closed, 'YYYY/mm/dd') as date_closed,
+                    u.company_id as company_id,
+                    c.priority as priority,
+                    c.project_id as project_id,
+                    c.type_id as type_id,
+                    count(*) as nbr,                    
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    project_issue c
+                left join
+                    res_users u on (c.id = u.id)
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id
+                ,c.date_closed,u.company_id,c.priority,c.project_id,c.type_id
+            )""")
+
+
+project_issue_report()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
new file mode 100755
index 00000000000..72d665cdff0
--- /dev/null
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+ <!-- Report for project issue -->
+        <record id="view_project_issue_report_tree" model="ir.ui.view">
+            <field name="name">project.issue.report.tree</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+				<tree string="Project Issue">
+	              	<field name="name" />
+					<field name="month"/>
+					<field name="priority" />
+					<field name="stage_id" />
+					<field name="type_id" string="Type"/>
+					<field name="project_id" invisible="1"/>
+					<field name="company_id" invisible="1"/>
+                	<field name="nbr" string="#Project Issue"/>
+                    <field name="delay_close"/>
+                    <field name="state" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="stage_id"  invisible="1"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="date_closed" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_project_issue_report_graph" model="ir.ui.view">
+            <field name="name">project.issue.report.graph</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Project Issue" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+        <record id="view_project_issue_report_filter" model="ir.ui.view">
+            <field name="name">project.issue.report.select</field>
+            <field name="model">project.issue.report</field>
+            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+               <data>
+                <xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Year"]' position='replace'>
+                    	<filter string="This Year" icon="terp-sale" domain="[('name','=',time.strftime('%%Y'))]"/>
+           		</xpath>
+            	<xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Month"]' position='replace'>
+                    	<filter string="This Month" icon="terp-sale" domain="[('month','=',time.strftime('%%m'))]"  />
+            	</xpath>
+                <xpath expr='//search[@string="Search"]/group[1]/filter[@string="Lost"]' position='after'>
+                        <separator orientation="vertical"/>
+                    	<filter string="Closed Today" icon="terp-sale" domain="[('date_closed','=',time.strftime('%%Y/%%m/%%d'))]" />
+            	</xpath>
+               	<xpath expr='//search[@string="Search"]/group[1]/field[3]' position='after'>
+						<field name="project_id" widget="selection"/>
+            	</xpath>
+               	<xpath expr='//search[@string="Search"]/group[@string="Group By..."]' position='before'>
+               	       <newline/>
+                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                    		<filter icon="terp-sale"
+                    		string="Highest"
+                    		domain="[('priority','=','1')]"/>
+                    		<filter icon="terp-sale"
+                    		string="High"
+                    		domain="[('priority','=','2')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Normal"
+                    		domain="[('priority','=','3')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Low"
+                    		domain="[('priority','=','4')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Lowest"
+                    		domain="[('priority','=','5')]"/>
+                		</group>
+                		<newline/>
+				</xpath>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Company"]' position='replace'>
+					<filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
+            	</xpath>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]' position='after'>
+            		<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+            		<separator orientation="vertical"/>
+            		<filter string="Project" icon="terp-sale" domain="[]" context="{'group_by':'project_id'}"/>
+            		<filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
+            	</xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="action_project_issue_report" model="ir.actions.act_window">
+            <field name="name">Project Issue</field>
+            <field name="res_model">project.issue.report</field>
+            <field name="view_type">form</field>
+  			<field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_project_issue_report_tree"/>
+            <field name="search_view_id" ref="view_project_issue_report_filter"/>
+        </record>
+
+
+       	<record model="ir.actions.act_window.view" id="action_project_issue_report_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_project_issue_report_tree"/>
+	        <field name="act_window_id" ref="action_project_issue_report"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_project_issue_report_graph">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="view_project_issue_report_graph"/>
+	        <field name="act_window_id" ref="action_project_issue_report"/>
+	    </record>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report"/>
+  </data>
+</openerp>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
new file mode 100755
index 00000000000..811387ed55e
--- /dev/null
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_issue","project.issue","model_project_issue","crm.group_crm_manager",1,1,1,1
+"access_project_issue_report","project.issue.report","model_project_issue_report","crm.group_crm_manager",1,0,0,0
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
new file mode 100755
index 00000000000..6d87dd1a06f
--- /dev/null
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+
+
+    <record model="ir.rule.group" id="project_issue_rule_group">
+        <field name="name">project.issue.rule.group</field>
+        <field name="model_id" search="[('model','=','project.issue')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+    </record>
+ 	<record id="project_issue_rule" model="ir.rule">
+        <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
+        <field name="rule_group" ref="project_issue_rule_group"/>
+    </record>    
+
+  </data>
+</openerp>
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__openerp__.py
similarity index 100%
rename from addons/purchase/__terp__.py
rename to addons/purchase/__openerp__.py
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 66337500234..1e88cf50e12 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">36</field>
             <field name="arch" type="xml">
                 <group name="sale_list" position="after" groups="base.group_extended">
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" groups="base.group_extended">
                         <separator string="Purchases Properties" colspan="2"/>
                         <field name="property_product_pricelist_purchase"/>
                     </group>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 78d365b2fab..edd482b3df4 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -20,7 +20,7 @@
       <menuitem id="menu_procurement_management_nventory" name="Inventory Control"
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
-              name="Incoming shipments" sequence="9"/>
+              name="Incoming Shipments" sequence="9"/>
         <menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
               name="Incoming Products" parent="menu_procurement_management_nventory" sequence="10"/>
 
@@ -81,7 +81,7 @@
                         <page string="Purchase Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('supplier','=', 1)]"/>
                             <field name="partner_address_id"/>
-                            <field domain="[('type','=','purchase')]" name="pricelist_id"/>
+                            <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="partner_ref"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
@@ -92,7 +92,7 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal" groups="base.group_extended"/>
                                 </tree>
                                 <!-- default form view -->
                             </field>
@@ -116,17 +116,17 @@
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices" groups="account.group_account_user">
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Delivery" colspan="2"/>
                                 <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
                                 <field name="minimum_planned_date"/>
-                                <field name="location_id" widget="selection"/>
+                                <field name="location_id"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Invoice Control" colspan="2"/>
                                 <field name="invoice_method"/>
-                                <field name="invoice_id" readonly="1"/>
-                                <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                                <field name="invoice_id" readonly="1" groups="base.group_extended"/>
+                                <field name="fiscal_position" widget="selection"/>
                             </group>
                             <newline/>
                             <separator string="Purchase Control" colspan="4"/>
@@ -148,8 +148,10 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                    <filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-purchase" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
+                    <filter icon="terp-purchase" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-purchase" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
+                    <filter icon="terp-purchase" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
@@ -169,38 +171,6 @@
               </search>
             </field>
         </record>
-
-        <record id="purchase_rfq" model="ir.actions.act_window">
-            <field name="name">Quotation Request</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="view_mode">tree,form</field>  
-            <field name="search_view_id" ref="view_purchase_order_filter"/>          
-        </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management" 
-                name="Request for Quotations" sequence="6"/>
-
-        <record id="purchase_form_action" model="ir.actions.act_window">
-            <field name="name">Purchase Orders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
-
-        <record id="purchase_form_action4" model="ir.actions.act_window">
-            <field name="name">Purchase Orders in Progress</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','approved')]</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
@@ -208,21 +178,42 @@
             <field name="arch" type="xml">
                 <tree string="Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="origin"/>
                     <field name="date_order" string="Order Date"/>
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="location_id"/>
                     <field name="minimum_planned_date"/>
+                    <field name="origin"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="shipped_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Untaxed amount"/>                               
+                    <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
+        <record id="purchase_rfq" model="ir.actions.act_window">
+            <field name="name">Requests for Quotation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="context">{'search_default_draft': 1}</field>
+            <field name="view_mode">tree,form,graph,calendar</field>
+        </record>
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management" 
+                sequence="6"/>
+
+        <record id="purchase_form_action" model="ir.actions.act_window">
+            <field name="name">Purchase Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_mode">tree,form,graph,calendar</field>
+            <field name="context">{'search_default_approved': 1}</field>
+        </record>
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
+
+
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
@@ -243,11 +234,11 @@
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
-                        <page string="History" groups="base.group_extended,stock.group_stock_user">
+                        <page string="History" groups="base.group_extended">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
                         </page>
-                        <page string="Invoicing" groups="account.group_account_user">
+                        <page string="Invoicing" groups="base.group_extended">
                             <field name="account_analytic_id" colspan="4"/>
                             <separator colspan="4" string="Taxes"/>
                             <field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index ac9abaaf590..f5c0a09b95d 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -46,7 +46,7 @@ class report_purchase_order(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'category_id': fields.many2one('product.category', 'Categories', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 06034528a70..7946d99ba37 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -76,9 +76,9 @@
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Responsible" name="by_user" icon="terp-purchase" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <filter string="Product" name="by_product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
                     <filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
-                    <filter string="Partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="Supplier" name="by_partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-purchase" context="{'group_by':'date'}"/>
@@ -93,7 +93,7 @@
         <field name="res_model">report.purchase.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_user":1}</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_product":1}</field>
         <field name="search_view_id" ref="view_purchase_order_search"/>
     </record>
 
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/purchase_analytic_plans/__terp__.py
rename to addons/purchase_analytic_plans/__openerp__.py
diff --git a/addons/purchase_manual/__terp__.py b/addons/purchase_manual/__openerp__.py
similarity index 100%
rename from addons/purchase_manual/__terp__.py
rename to addons/purchase_manual/__openerp__.py
diff --git a/addons/purchase_requisition/__terp__.py b/addons/purchase_requisition/__openerp__.py
similarity index 100%
rename from addons/purchase_requisition/__terp__.py
rename to addons/purchase_requisition/__openerp__.py
diff --git a/addons/report_designer/__terp__.py b/addons/report_designer/__openerp__.py
similarity index 100%
rename from addons/report_designer/__terp__.py
rename to addons/report_designer/__openerp__.py
diff --git a/addons/report_document/i18n/ro.po b/addons/report_document/i18n/ro.po
index fcb1ae238d5..ea6a0b26579 100644
--- a/addons/report_document/i18n/ro.po
+++ b/addons/report_document/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__openerp__.py
similarity index 100%
rename from addons/report_intrastat/__terp__.py
rename to addons/report_intrastat/__openerp__.py
diff --git a/addons/report_mrp/i18n/bg.po b/addons/report_mrp/i18n/bg.po
index bf29b3ed3b5..6ee3ec24adc 100644
--- a/addons/report_mrp/i18n/bg.po
+++ b/addons/report_mrp/i18n/bg.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 10:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-17 17:39+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-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Седмица"
 
 #. module: report_mrp
 #: constraint:ir.ui.view:0
@@ -43,17 +43,17 @@ msgstr ""
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenters load"
-msgstr ""
+msgstr "Натоварване на работните центрове"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_workcenter_load
 msgid "Workcenter Load"
-msgstr ""
+msgstr "Натоварване на работния центрър"
 
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
 msgid "MRP Management - Reporting"
-msgstr ""
+msgstr "MRP - Справки"
 
 #. module: report_mrp
 #: field:report.mrp.inout,value:0
diff --git a/addons/report_project/i18n/bg.po b/addons/report_project/i18n/bg.po
index 54d31c1dce3..b36de773ce4 100644
--- a/addons/report_project/i18n/bg.po
+++ b/addons/report_project/i18n/bg.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 12:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-17 17:35+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-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
 msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "Приключени задачи по проект (текущ месец)"
 
 #. module: report_project
 #: constraint:ir.model:0
@@ -34,60 +34,60 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
 msgid "Tasks Closed by Project and User"
-msgstr ""
+msgstr "Приключени задачи по проект и по потребител"
 
 #. module: report_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
 msgid "Tasks finished by project and user (this month)"
-msgstr ""
+msgstr "Приключени задачи по проект и по потребител (текущ месец)"
 
 #. module: report_project
 #: field:report.project.task,hours_effective:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Ефективни часове"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Задачи според потребител и проект"
 
 #. module: report_project
 #: field:report.project.task,task_closed:0
 #: field:report.project.task.user,task_closed:0
 msgid "Task Closed"
-msgstr ""
+msgstr "Приключване на задача"
 
 #. module: report_project
 #: view:report.project.task:0
 msgid "Tasks by Project"
-msgstr ""
+msgstr "Задачи по проект"
 
 #. module: report_project
 #: model:ir.module.module,shortdesc:report_project.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Управление на продажби – справки"
 
 #. module: report_project
 #: field:report.project.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Потребител"
 
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by Project and User"
-msgstr ""
+msgstr "Задачи по проект и по потребител"
 
 #. module: report_project
 #: model:ir.ui.menu,name:report_project.next_id_63
 msgid "This Month"
-msgstr "Този месец"
+msgstr "Текущ месец"
 
 #. module: report_project
 #: constraint:ir.ui.view:0
@@ -97,25 +97,25 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by projects and users"
-msgstr ""
+msgstr "Задачи по проекти и по потребители"
 
 #. module: report_project
 #: field:report.project.task,project_id:0
 #: field:report.project.task.user,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #. module: report_project
 #: field:report.project.task,closing_days:0
 #: field:report.project.task.user,closing_days:0
 msgid "Avg Closing Delay"
-msgstr ""
+msgstr "Прибл. закъснение на приключването"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task
 #: view:report.project.task:0
 msgid "Tasks by project"
-msgstr ""
+msgstr "Задачи по проект"
 
 #. module: report_project
 #: field:report.project.task,hours_delay:0
@@ -127,16 +127,16 @@ msgstr ""
 #: field:report.project.task,name:0
 #: field:report.project.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree
 msgid "Tasks Closed by Project"
-msgstr ""
+msgstr "Приключени задачи по проект"
 
 #. module: report_project
 #: field:report.project.task,hours_planned:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Планирани часове"
diff --git a/addons/report_purchase/i18n/bg.po b/addons/report_purchase/i18n/bg.po
index da06477c1b6..fccdd4b19ff 100644
--- a/addons/report_purchase/i18n/bg.po
+++ b/addons/report_purchase/i18n/bg.po
@@ -7,49 +7,49 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 17:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-17 17: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-04-17 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_average:0
 #: field:report.purchase.order.product,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,state:0
 #: field:report.purchase.order.product,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Състояние на поръчка"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all
 #: view:report.purchase.order.category:0
 msgid "Purchases by Category of Products"
-msgstr ""
+msgstr "Покупки по категории продукти"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_product
 msgid "Purchases Orders by Products"
-msgstr ""
+msgstr "Поръчки за покупки по продукти"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all
 msgid "Purchases by Products"
-msgstr ""
+msgstr "Покупки по продукти"
 
 #. module: report_purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_75
@@ -74,17 +74,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product
 msgid "Purchases by Products (this month)"
-msgstr ""
+msgstr "Покупки по продукти (текущ месец)"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_category
 msgid "Purchases Orders by Categories"
-msgstr ""
+msgstr "Попъчки за покупки по категории"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Продукт"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_73
@@ -94,19 +94,19 @@ msgstr "Справки"
 #. module: report_purchase
 #: model:ir.module.module,shortdesc:report_purchase.module_meta_information
 msgid "Purchase Management - Reporting"
-msgstr ""
+msgstr "Управление на покупки - докладване"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешка при фактуриране"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Крайна цена"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,quantity:0
@@ -117,18 +117,18 @@ msgstr ""
 #. module: report_purchase
 #: view:report.purchase.order.product:0
 msgid "Purchases by products"
-msgstr ""
+msgstr "Покупки по продукти"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category
 #: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product
 msgid "Monthly purchases"
-msgstr ""
+msgstr "Месечни покупки"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_74
 msgid "This Month"
-msgstr "Този месец"
+msgstr "Текущ месец"
 
 #. module: report_purchase
 #: model:ir.module.module,description:report_purchase.module_meta_information
@@ -142,7 +142,7 @@ msgstr ""
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Оферта"
 
 #. module: report_purchase
 #: constraint:ir.ui.view:0
@@ -153,31 +153,31 @@ msgstr "Невалиден XML за преглед на архитектурат
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ръчно в изпълнение"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category
 msgid "Purchases by Category of Product (this month)"
-msgstr ""
+msgstr "Покупки по категория на продукт (текущ месец)"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Грешка при доставка"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "In progress"
-msgstr ""
+msgstr "Извършва се"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,name:0
 #: field:report.purchase.order.product,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,count:0
@@ -188,15 +188,15 @@ msgstr ""
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,category_id:0
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
diff --git a/addons/resource/__terp__.py b/addons/resource/__openerp__.py
similarity index 100%
rename from addons/resource/__terp__.py
rename to addons/resource/__openerp__.py
diff --git a/addons/sale/__terp__.py b/addons/sale/__openerp__.py
similarity index 100%
rename from addons/sale/__terp__.py
rename to addons/sale/__openerp__.py
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 60ca4905ab1..53106924cac 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 09:45+0000\n"
+"PO-Revision-Date: 2010-04-17 17:15+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -86,18 +86,18 @@ msgstr "Invoice berhasil dibuat"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "Keterangan Otomatis"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "Baris Order belum terinvoice dan belum terkirim"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sebagai Konsep"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -108,12 +108,12 @@ msgstr ""
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
+msgstr "Ini adalah daftar pengepakan yang telah dibuat untuk invoice ini"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr ""
+msgstr "Pengiriman, dari gudang ke pelanggan"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -123,17 +123,17 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Validasi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Buat Invoice"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -146,12 +146,12 @@ msgstr ""
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Pembatalan Order"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Perpindahan Barang"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -164,23 +164,23 @@ msgstr ""
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 msgid "Invoice after delivery"
-msgstr ""
+msgstr "Ditagihkan setelah pengiriman"
 
 #. module: sale
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Pajak-pajak"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total Net :"
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -190,7 +190,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Dibatalkan"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -200,43 +200,43 @@ msgstr ""
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Asal"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Alamat Invoice"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Barang Keluar"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Referensi"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Sekaligus"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr ""
+msgstr "Pengadaan dibuat setelah order penjualan dikonfirmasi"
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Akun Analisis"
 
 #. module: sale
 #: rml:sale.order:0
@@ -246,33 +246,33 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Metode Pengadaan"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Penjelasan lebih lanjut"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
 msgid "Net Price"
-msgstr ""
+msgstr "Harga Bersih"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr ""
+msgstr "Penjualan saya yang masih dalam proses"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Kwantitas (UoS)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -282,11 +282,16 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Order Penjualan sebara otomatis akan membuat konsep invoice. Kwantitas yang "
+"diorder dan yang terkirim mungkin tidak sama. Anda harus memilih, "
+"tagihan/invoice berdasarkan order atau kwantitas barang yang terkirim. Jika "
+"produk adalah jasa, maksud dari kwantitas yang terkirim adalah jumlah jam "
+"yang telah ditempuh dalam suatu pekerjaan"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -297,61 +302,61 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_all
 msgid "All Sales Order"
-msgstr ""
+msgstr "Semua Order Penjualan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Konfirmasi"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Alamat Pengiriman"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Kwantitas Terkirim"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "Tagihan/Invoice berdasakan pada Order Penjualan"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "Toko"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Gudang"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "No. Order"
 
 #. module: sale
 #: field:sale.order,order_line:0
 #: view:sale.order.line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Baris Order"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Potongan (%)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Detail Invoice"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
@@ -361,7 +366,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Total sebelum pajak"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -379,7 +384,7 @@ msgstr ""
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Alamat pengiriman :"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -396,7 +401,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Keterangan Manual"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -408,7 +413,7 @@ msgstr ""
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "Baris Order Penjualan"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -423,40 +428,40 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr ""
+msgstr "Kemasan"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "konnfirmasi Order"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referensi Order"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Selesai"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Harga"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_shop_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Pengaturan"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -466,7 +471,7 @@ msgstr ""
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Salah dalam penyusunan format XML"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -476,12 +481,12 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,payment_account_id:0
 msgid "Payment Accounts"
-msgstr ""
+msgstr "Akun Pembayaran"
 
 #. module: sale
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Salah: UoS dan UoM harus berbeda kategori"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -491,46 +496,46 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Sales orders"
-msgstr ""
+msgstr "Order Penjualan"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Pengadaan"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Payment accounts"
-msgstr ""
+msgstr "Akun Pembayaran"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,end:0
 msgid "Close"
-msgstr ""
+msgstr "Selesai"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Konsep Invoice"
 
 #. module: sale
 #: wizard_field:sale.order.line.make_invoice,init,grouped:0
 #: wizard_field:sale.order.make_invoice,init,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Mengelompokan Invoice"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "Semua Penawaran"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Potongan (%)"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -645,6 +650,8 @@ msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
 msgstr ""
+"Langkah konfigurasi ini digunakan untuk membuat standart pengepakan ketika "
+"membuat order penjualan"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -1237,7 +1244,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr ""
+msgstr "Setelah konfirmasi order, Buat Invoice"
 
 #. module: sale
 #: constraint:product.product:0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5428cd1c360..a9ed5fa97f8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1093,7 +1093,8 @@ class sale_config_picking_policy(osv.osv_memory):
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
-        ], 'Shipping Default Policy', required=True),
+        ], 'Shipping Default Policy', required=True,
+           help="You can generate invoices based on sales orders or based on shippings."),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')
@@ -1105,7 +1106,7 @@ class sale_config_picking_policy(osv.osv_memory):
     }
     _defaults = {
         'picking_policy': lambda *a: 'direct',
-        'order_policy': lambda *a: 'picking',
+        'order_policy': lambda *a: 'manual',
         'step': lambda *a: 'one'
     }
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3118c5d5fe1..156ede282d0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -119,7 +119,6 @@
                                 <form string="Sale Order Lines">
                                     <notebook>
                                         <page string="Order Line">
-                                            <separator colspan="4" string="Automatic Declaration"/>
                                             <field colspan="4"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
                                                 name="product_id"
@@ -140,7 +139,6 @@
                                                 groups="base.group_extended"/>
 
                                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                            <separator colspan="4" string="Manual Description"/>
                                             <field colspan="4" name="name"/>
                                             <field name="price_unit"/>
                                             <field name="discount"/>
@@ -148,9 +146,9 @@
                                             <field name="delay" groups="base.group_extended"/>
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <separator colspan="4" string="States"/>
-                                            <field name="state"/>
-                                            <group col="3" colspan="2">
+                                            <group colspan="4" col="5" groups="base.group_extended">
+                                                <separator colspan="5" string="States"/>
+                                                <field name="state"/>
                                                 <field name="invoiced"/>
                                                 <button colspan="1"
                                                     name="%(action_view_sale_order_line_make_invoice)d"
@@ -212,7 +210,7 @@
                             </group>
                         </page>
                         <page string="Other data">
-                            <group colspan="2" col="2" groups="base.group_extended">
+                            <group colspan="2" col="2" groups="base.group_extended" name="logistic">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm"/>
                                 <field name="picking_policy" required="True"/>
@@ -352,8 +350,7 @@
                     <field name="product_id"/>
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
-                    <field name="discount"/>
-                    <field name="price_unit"/>
+                    <field name="salesman_id"/>
                     <field name="price_net"/>
                     <field name="price_subtotal"/>
                     <field name="th_weight"/>
@@ -432,6 +429,7 @@
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-sale"  domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'salesman_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -447,6 +445,7 @@
                     <group>
                     <filter icon="terp-purchase" string="Shipped"
                         domain="[('state','=','done')]"
+                        name="unshipped"
                         separator="1" />
                     <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
@@ -468,12 +467,12 @@
         </record>
 
         <record id="action_order_line_tree2" model="ir.actions.act_window">
-            <field name="name">Uninvoiced Lines</field>
+            <field name="name">Lines to Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{"search_default_uninvoiced":1}</field>
+            <field name="context">{"search_default_uninvoiced":1,"search_default_unshipped":1}</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>
@@ -492,7 +491,7 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
-        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
+        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
@@ -508,11 +507,11 @@
                 </form>
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0"
-                         string="Set the policies selected by default when creating a new sale order."/>
+                         string="Setup your sales workflow and default values."/>
                   <separator colspan="4"
                        string="Configure Sale Order Logistic"/>
                   <newline/>
-                  <field name="picking_policy"/>
+                  <field name="picking_policy" groups="base.group_extended"/>
                   <newline/>
                   <field name="order_policy"/>
                   <newline/>
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/sale_analytic_plans/__terp__.py
rename to addons/sale_analytic_plans/__openerp__.py
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index 008ff1411e5..374835f0a4c 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_analytic_plans/i18n/bg.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-24 19:48+0000\n"
+"PO-Revision-Date: 2010-04-17 16:49+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-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Аналитично рапределение"
 
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
@@ -29,4 +29,4 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "Аналитично разпределение на продажби"
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__openerp__.py
similarity index 100%
rename from addons/sale_crm/__terp__.py
rename to addons/sale_crm/__openerp__.py
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index 2be91242994..f4d5fea0969 100644
--- a/addons/sale_crm/i18n/bg.po
+++ b/addons/sale_crm/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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 11:58+0000\n"
+"PO-Revision-Date: 2010-04-17 16:22+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-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -29,7 +29,7 @@ msgstr "Анализ потенциални възможности"
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr ""
+msgstr "Използвай този партньор, ако няма друг партньор по случая"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
@@ -49,7 +49,7 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr ""
+msgstr "Превръщане на потенциална възможност в оферта"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
@@ -79,7 +79,7 @@ msgstr "Изготви оферта"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr ""
+msgstr "Договорен обем (ценови списък)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
@@ -104,7 +104,7 @@ msgstr "Директна доставка"
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr ""
+msgstr "Потенциална оферта"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
@@ -132,7 +132,7 @@ msgstr "Клиент"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr ""
+msgstr "Превръщане на потенциална възможност в ценови списък"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
@@ -142,7 +142,7 @@ msgstr "Отговорности на потребителя"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr ""
+msgstr "Отрази сключения договор с клиента"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
@@ -173,12 +173,12 @@ msgstr "CRM потенциалната възможност може да дов
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr ""
+msgstr "Ценова листа за потенциална възможност"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
 msgid "Contract Pricelist"
-msgstr ""
+msgstr "Ценови списък по договор"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
@@ -205,4 +205,4 @@ msgstr "Отказ"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr ""
+msgstr "Секция Случаи"
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index f605a655239..526c0eb4d10 100644
--- a/addons/sale_crm/i18n/ko.po
+++ b/addons/sale_crm/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 6402ecc1450..24912052190 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,10 +8,10 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
-            <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
+            <field name="priority" position="after">
                 <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
-                <label colspan="6"  string=""/>
-            </xpath>           
+                <label colspan="2"  string=""/>
+            </field>
         </field>
     </record>
 
@@ -22,7 +22,7 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="section_id" widget="selection"/>
+                <field name="section_id" widget="selection" groups="base.group_extended"/>
             </field>
         </field>
     </record>
@@ -37,6 +37,7 @@
                 <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
+                            groups="base.group_extended"
                             help="My section"/>
                 </field>
             </field>
diff --git a/addons/sale_delivery_report/__terp__.py b/addons/sale_delivery_report/__openerp__.py
similarity index 100%
rename from addons/sale_delivery_report/__terp__.py
rename to addons/sale_delivery_report/__openerp__.py
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__openerp__.py
similarity index 100%
rename from addons/sale_journal/__terp__.py
rename to addons/sale_journal/__openerp__.py
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__openerp__.py
similarity index 100%
rename from addons/scrum/__terp__.py
rename to addons/scrum/__openerp__.py
diff --git a/addons/service/__terp__.py b/addons/service/__openerp__.py
similarity index 100%
rename from addons/service/__terp__.py
rename to addons/service/__openerp__.py
diff --git a/addons/smtpclient/__terp__.py b/addons/smtpclient/__openerp__.py
similarity index 100%
rename from addons/smtpclient/__terp__.py
rename to addons/smtpclient/__openerp__.py
diff --git a/addons/smtpclient/smtpclient_view.xml b/addons/smtpclient/smtpclient_view.xml
index 4a2182f2699..0772dba233a 100644
--- a/addons/smtpclient/smtpclient_view.xml
+++ b/addons/smtpclient/smtpclient_view.xml
@@ -96,7 +96,6 @@
                                 <field name="user" select="1" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/>
                                 <field name="password" password="True" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/>
                             </group>
-                            
                             <group col="2" colspan="2">
                                 <separator string="Message Queue Configuration" colspan="2" />
                                 <field name="active" select="2" />
@@ -129,7 +128,7 @@
                         </page>
                         <page string="Messages">
                             <separator string="Verification Message" colspan="4" />
-                            <field name="verify_email" select="2" colspan="4" nolabel="1" />
+                            <field name="verify_email" colspan="4" nolabel="1" />
                             <label string="__code__ for Verification Code" />
                             <separator string="Test Message" colspan="4" />
                             <field name="test_email" select="2" colspan="4" nolabel="1" />
@@ -263,7 +262,7 @@
                         </page>
                         <page string="Error">
                             <separator string="Last Error occured" colspan="4"/>
-                            <field name="error" select="2" nolabel="1"/>
+                            <field name="error" nolabel="1"/>
                         </page>
                         <page string="Message">
                             <separator string="Message with All Headers" colspan="4"/>
diff --git a/addons/stock/__terp__.py b/addons/stock/__openerp__.py
similarity index 100%
rename from addons/stock/__terp__.py
rename to addons/stock/__openerp__.py
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 5ea3fef9626..6d6b48ffa98 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index d3f04ae9afc..487dbcf55ea 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -12,7 +12,7 @@
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
         <page string="Sales &amp; Purchases" position="inside">
-          <group colspan="4" col="4">
+          <group colspan="4" col="4" groups="base.group_extended">
             <separator string="Stock Properties" colspan="4"/>
             <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" />
             <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]"/>
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 85a46601479..da1dd27ff14 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -142,6 +142,7 @@ class report_stock_lines_date(osv.osv):
     _name = "report.stock.lines.date"
     _description = "Dates of Inventories"
     _auto = False
+    _order = "date"
     _columns = {
         'id': fields.integer('Inventory Line Id', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
@@ -152,16 +153,13 @@ class report_stock_lines_date(osv.osv):
         cr.execute("""
             create or replace view report_stock_lines_date as (
                 select
-                min(l.id) as id,
+                p.id as id,
                 p.id as product_id,
                 max(s.date) as date
-                from
+            from
                 product_product p
-                left outer join
-                stock_inventory_line l on (p.id=l.product_id)
-                left join stock_inventory s
-                on (l.inventory_id=s.id)
-                where l.create_date is not null
+                    left outer join stock_inventory_line l on (p.id=l.product_id)
+                    left join stock_inventory s on (l.inventory_id=s.id)
                 and s.state = 'done'
                 group by p.id
             )""")
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index ec15f123864..1bf4e675dcd 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -12,7 +12,6 @@
                         <filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
                         <filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
-
                         <separator orientation="vertical"/>
                         <field name="location_id" select="1"/>
                         <field name="product_id" select="1" default="1"/>
@@ -77,8 +76,6 @@
             <field name="context">{'full':'1',"search_default_in_location":1}</field>
             <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
         </record>
-
-
         <record id="stock_report_tracklots_tree" model="ir.ui.view">
             <field name="name">stock.report.tracklots.view</field>
             <field name="model">stock.report.tracklots</field>
@@ -103,11 +100,6 @@
 <!--            name="Traceability"-->
 <!--            parent="next_id_61"/>-->
 
-        <menuitem
-            action="action_stock_report_prodlots_form"
-            id="menu_stock_report_prodlots"
-            parent="stock.menu_stock_inventory_control" sequence="10"/>
-
         <act_window
             context="{'product_id': active_id}"
             id="act_stock_product_location_open"
@@ -154,20 +146,42 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="report_stock_lines_date_search">
+            <field name="name">report.stock.lines.date.search</field>
+            <field name="model">report.stock.lines.date</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Dates of Inventories">
+                    <filter icon="gtk-media-rewind" string="Stockable"
+                        default="1"
+                        domain="[('product_id.type','=', 'product')]"/>
+                    <filter icon="gtk-media-rewind" string="Consumable"
+                        domain="[('product_id.type','=', 'consumable')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="gtk-media-rewind" string="Non Inv"
+                        domain="[('date','=', False)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" select="1"/>
+                    <field name="date" select="1" />
+                </search>
+            </field>
+        </record>
+
+
         <record model="ir.ui.view" id="report_stock_lines_date_form">
             <field name="name">report.stock.lines.date.form</field>
             <field name="model">report.stock.lines.date</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Dates of Inventories">
-                    <field name="product_id" select="1"/>
-                    <field name="date" select="1" />
+                    <field name="product_id"/>
+                    <field name="date"/>
                 </form>
             </field>
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_line_date">
-            <field name="name">Latest Inventories Dates by Product</field>
+            <field name="name">Dates of Latest Inventories by Product</field>
             <field name="res_model">report.stock.lines.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -175,6 +189,19 @@
 
         <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
 
+        <record id="view_location_graph" model="ir.ui.view">
+            <field name="name">stock.location.graph</field>
+            <field name="model">stock.location</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Stock Location">
+                    <field name="complete_name"/>
+                    <field name="stock_real_value" operator="+"/>
+                    <field name="stock_virtual_value" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="view_location_tree_3" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -193,12 +220,17 @@
             <field name="name">Inventory Valuation</field>
             <field name="res_model">stock.location</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_location_tree_3"/>
         </record>
         <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/>
 
-    <!-- end...  -->
+        <menuitem
+            action="action_stock_report_prodlots_form"
+            id="menu_stock_report_prodlots"
+            parent="next_id_61" sequence="10"/>
+
+
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index db5a8695b86..03fb721959b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -176,7 +176,9 @@
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
-        <menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/>
+        <menuitem action="action_tracking_form" id="menu_action_tracking_form"
+            groups="base.group_extended"
+            parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
             <field name="name">stock.tracking.tree</field>
@@ -338,12 +340,6 @@
             </field>
         </record>
 
-        <!--wizard
-            id="action_lot2"
-            model="stock.production.lot"
-            name="stock.traceability.lot.upstream"
-            string="Upstream traceability"/-->
-
         <!--wizard
             id="action_lot4"
             model="stock.production.lot"
@@ -428,6 +424,25 @@
             </field>
         </record>
 
+        <record id="view_location_search" model="ir.ui.view">
+            <field name="name">stock.location.search</field>
+            <field name="model">stock.location</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Stock Locations">
+                    <filter icon="terp-stock" name="in_location"
+                        string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
+                    <filter icon="terp-stock" name="customer"
+                        string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
+                    <filter icon="terp-stock" name="supplier"
+                        string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
+
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -449,7 +464,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_location_tree2"/>
-            <field name="context">{'full':'1'}</field>
+            <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />
 
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__openerp__.py
similarity index 100%
rename from addons/stock_invoice_directly/__terp__.py
rename to addons/stock_invoice_directly/__openerp__.py
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__openerp__.py
similarity index 100%
rename from addons/stock_location/__terp__.py
rename to addons/stock_location/__openerp__.py
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index 252f0c3e56c..ceeab4f0e25 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/__terp__.py b/addons/stock_no_autopicking/__openerp__.py
similarity index 100%
rename from addons/stock_no_autopicking/__terp__.py
rename to addons/stock_no_autopicking/__openerp__.py
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 42e475c8de8..55cfd964409 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__openerp__.py
similarity index 100%
rename from addons/stock_planning/__terp__.py
rename to addons/stock_planning/__openerp__.py
diff --git a/addons/subscription/__terp__.py b/addons/subscription/__openerp__.py
similarity index 100%
rename from addons/subscription/__terp__.py
rename to addons/subscription/__openerp__.py
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index eadb991a609..23b144ce963 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/survey/__terp__.py b/addons/survey/__openerp__.py
similarity index 100%
rename from addons/survey/__terp__.py
rename to addons/survey/__openerp__.py
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 7cb308d10d8..968590a5d07 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -128,6 +128,7 @@ class survey(osv.osv):
                 'context' : context
             }
         else:
+            
             datas['form'] = page_setting
             datas['model'] = 'survey.print'
             report = {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 353c724a6ed..4f9eff96b84 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -41,7 +41,7 @@
                                         <form string="Survey Question">
                                             <field name="question" colspan="4" select="1"/>
                                             <field name="sequence"/>
-                                            <field name="tot_resp" select="2"/>
+                                            <field name="tot_resp"/>
                                             <field name="type" on_change="on_change_type(type)"/>
                                             <field name="in_visible_rating_weight" invisible="1"/>
                                             <field name="in_visible_menu_choice" invisible="1"/>
@@ -193,7 +193,7 @@
                             <group colspan="6" col='4'>
                                 <field name="max_response_limit" select="1"
                                     attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="response_user" select="2"
+                                <field name="response_user"
                                     attrs="{'readonly':[('state','in',('open','close'))]}"/>
                                 <field name="type"/>
                                 <field name="send_response"/>
@@ -203,7 +203,7 @@
                         </page>
                         <page string="History">
                             <field name="date_open" select="1"/>
-                            <field name="date_close" select="2"/>
+                            <field name="date_close"/>
                             <field name="tot_start_survey" select="1"/>
                             <field name="tot_comp_survey" select="1"/>
                             <field name="history" colspan="4" nolabel="1">
@@ -231,9 +231,9 @@
                     <field name="title" select="1"/>
                     <field name="type" select="1"/>
                     <field name="date_open" select="1" string="Open Date"/>
-                    <field name="responsible_id" select="2"/>
-                    <field name="tot_start_survey" select="2" string="Started"/>
-                    <field name="tot_comp_survey" select="2" string="Completed"/>
+                    <field name="responsible_id"/>
+                    <field name="tot_start_survey" string="Started"/>
+                    <field name="tot_comp_survey" string="Completed"/>
                     <field name="state" select="1"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Test Survey" type="action" icon="gtk-new"
@@ -301,7 +301,7 @@
                     <form string="Survey Question">
                         <field name="question" colspan="4" select="1"/>
                         <field name="sequence"/>
-                        <field name="tot_resp" select="2"/>
+                        <field name="tot_resp"/>
                         <field name="type" on_change="on_change_type(type)"/>
                         <field name="in_visible_rating_weight" invisible="1"/>
                         <field name="in_visible_menu_choice" invisible="1"/>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 2bc48cf339d..b5f88f20432 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -588,14 +588,15 @@ class survey_question_wiz(osv.osv_memory):
                     self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
                     self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-
-        for key,val in sur_name_read['store_ans'].items():
-            for field in vals:
-                if field.split('_')[0] == val['question_id']:
-                    click_state = False
-                    click_update.append(key)
-                    break
-
+        if sur_name_read['store_ans'] and type(sur_name_read['store_ans']) == dict:
+            for key,val in sur_name_read['store_ans'].items():
+                for field in vals:
+                    if field.split('_')[0] == val['question_id']:
+                        click_state = False
+                        click_update.append(key)
+                        break
+        else:
+            sur_name_read['store_ans'] = {}
         if click_state:
             que_li = []
             resp_id_list = []
diff --git a/addons/thunderbird/__terp__.py b/addons/thunderbird/__openerp__.py
similarity index 100%
rename from addons/thunderbird/__terp__.py
rename to addons/thunderbird/__openerp__.py
diff --git a/addons/users_ldap/__terp__.py b/addons/users_ldap/__openerp__.py
similarity index 100%
rename from addons/users_ldap/__terp__.py
rename to addons/users_ldap/__openerp__.py
diff --git a/addons/warning/__terp__.py b/addons/warning/__openerp__.py
similarity index 100%
rename from addons/warning/__terp__.py
rename to addons/warning/__openerp__.py
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__openerp__.py
similarity index 97%
rename from addons/wiki/__terp__.py
rename to addons/wiki/__openerp__.py
index b15346dba39..033060ad1a7 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__openerp__.py
@@ -36,7 +36,6 @@
         'wizard/wizard_view.xml',
         'wizard/wiki_wiki_page_open_view.xml',
         'wizard/wiki_create_menu_view.xml',
-        'wizard/wiki_wiki_help_open_view.xml',
         'wizard/wiki_make_index_view.xml',
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 9ddfa27eee2..14ee1c656db 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -8,5 +8,4 @@
 "wiki_wizard_wiki_history_show_diff","wizard.wiki.history.show_diff","model_wizard_wiki_history_show_diff","base.group_user",1,1,1,1
 "wiki_wiki_page_open","wiki.wiki.page.open","model_wiki_wiki_page_open","base.group_user",1,1,1,1
 "wiki_create_menu","wiki.create.menu","model_wiki_create_menu","base.group_user",1,1,1,1
-"wiki_wiki_help_open","wiki.wiki.help.open","model_wiki_wiki_help_open","base.group_user",1,1,1,1
 "wiki_make_index","wiki.make.index","model_wiki_make_index","base.group_user",1,1,1,1
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 55b71b8ae10..a9b623611b8 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -27,6 +27,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 import difflib
 
 class Wiki(osv.osv):
@@ -44,19 +45,19 @@ class WikiGroup(osv.osv):
     _order = 'name'
 
     _columns = {
-       'name':fields.char('Wiki Group', size=256, select=True, required=True), 
-       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'), 
-       'notes':fields.text("Description"), 
-       'create_date':fields.datetime("Created Date", select=True), 
-       'template': fields.text('Wiki Template'), 
-       'section': fields.boolean("Make Section ?"), 
+       'name':fields.char('Wiki Group', size=256, select=True, required=True),
+       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
+       'notes':fields.text("Description"),
+       'create_date':fields.datetime("Created Date", select=True),
+       'template': fields.text('Wiki Template'),
+       'section': fields.boolean("Make Section ?"),
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
-                                   ('tree', 'Tree')], 'Display Method'), 
-       'home':fields.many2one('wiki.wiki', 'Pages'), 
+                                   ('tree', 'Tree')], 'Display Method'),
+       'home':fields.many2one('wiki.wiki', 'Home Page'),
     }
 
     _defaults = {
-        'method': lambda *a: 'page', 
+        'method': lambda *a: 'page',
     }
 
 WikiGroup()
@@ -70,7 +71,7 @@ class GroupLink(osv.osv):
     _rec_name = 'action_id'
 
     _columns = {
-       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'), 
+       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
        'action_id': fields.many2one('ir.ui.menu', 'Menu')
     }
 
@@ -85,22 +86,22 @@ class Wiki(osv.osv):
     _order = 'section,create_date desc'
 
     _columns = {
-        'name': fields.char('Title', size=256, select=True, required=True), 
-        'write_uid': fields.many2one('res.users', "Last Author"), 
-        'text_area': fields.text("Content"), 
-        'create_uid': fields.many2one('res.users', 'Author', select=True), 
-        'create_date': fields.datetime("Created on", select=True), 
-        'write_date': fields.datetime("Modification Date", select=True), 
-        'tags': fields.char('Tags', size=1024), 
-        'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'), 
-        'minor_edit': fields.boolean('Minor edit', select=True), 
-        'summary': fields.char('Summary', size=256), 
-        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"), 
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'), 
-        'toc': fields.boolean('Table of Contents'), 
-        'review': fields.boolean('Need Review'), 
-        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'), 
-        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'), 
+        'name': fields.char('Title', size=256, select=True, required=True),
+        'write_uid': fields.many2one('res.users', "Last Author"),
+        'text_area': fields.text("Content"),
+        'create_uid': fields.many2one('res.users', 'Author', select=True),
+        'create_date': fields.datetime("Created on", select=True),
+        'write_date': fields.datetime("Modification Date", select=True),
+        'tags': fields.char('Tags', size=1024),
+        'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
+        'minor_edit': fields.boolean('Minor edit', select=True),
+        'summary': fields.char('Summary', size=256),
+        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
+        'toc': fields.boolean('Table of Contents'),
+        'review': fields.boolean('Need Review'),
+        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
+        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
@@ -125,7 +126,7 @@ class Wiki(osv.osv):
         section = '.'.join(s)
         return {
             'value':{
-                'text_area': template, 
+                'text_area': template,
                 'section': section
             }
         }
@@ -147,10 +148,10 @@ class Wiki(osv.osv):
         history = self.pool.get('wiki.wiki.history')
         if vals.get('text_area'):
             res = {
-                'minor_edit': vals.get('minor_edit', True), 
-                'text_area': vals.get('text_area', ''), 
-                'write_uid': uid, 
-                'wiki_id': id, 
+                'minor_edit': vals.get('minor_edit', True),
+                'text_area': vals.get('text_area', ''),
+                'write_uid': uid,
+                'wiki_id': id,
                 'summary':vals.get('summary', '')
             }
             history.create(cr, uid, res)
@@ -166,15 +167,37 @@ class Wiki(osv.osv):
         if vals.get('text_area'):
             for id in ids:
                 res = {
-                    'minor_edit': vals.get('minor_edit', True), 
-                    'text_area': vals.get('text_area', ''), 
-                    'write_uid': uid, 
-                    'wiki_id': id, 
+                    'minor_edit': vals.get('minor_edit', True),
+                    'text_area': vals.get('text_area', ''),
+                    'write_uid': uid,
+                    'wiki_id': id,
                     'summary': vals.get('summary', '')
                 }
                 history.create(cr, uid, res)
         return result
 
+    def open_wiki_page(self, cr, uid, ids, context):
+
+        """ Opens Wiki Page for Editing
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of wiki page’s IDs
+
+        """
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
+        if not pages:
+           raise osv.except_osv(_('Warning !'), _("No Help page is defined"))
+        value = {
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'wiki.wiki',
+            'view_id': False,
+            'res_id': pages[0],
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+        }
+        return value
+
 Wiki()
 
 
@@ -187,16 +210,16 @@ class History(osv.osv):
     _order = 'id DESC'
 
     _columns = {
-              'create_date': fields.datetime("Date", select=True), 
-              'text_area': fields.text("Text area"), 
-              'minor_edit': fields.boolean('This is a major edit ?', select=True), 
-              'summary': fields.char('Summary', size=256, select=True), 
-              'write_uid': fields.many2one('res.users', "Modify By", select=True), 
+              'create_date': fields.datetime("Date", select=True),
+              'text_area': fields.text("Text area"),
+              'minor_edit': fields.boolean('This is a major edit ?', select=True),
+              'summary': fields.char('Summary', size=256, select=True),
+              'write_uid': fields.many2one('res.users', "Modify By", select=True),
               'wiki_id': fields.many2one('wiki.wiki', 'Wiki Id', select=True)
             }
 
     _defaults = {
-        'write_uid': lambda obj, cr, uid, context: uid, 
+        'write_uid': lambda obj, cr, uid, context: uid,
     }
 
     def getDiff(self, cr, uid, v1, v2, context={}):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 26d29239830..4675cea75f9 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -124,20 +124,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wiki">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
                         <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section" select="2" invisible="not context.get('section',False)"/>
+                        <field name="section" invisible="not context.get('section',False)"/>
                         <field name="parent_id"/>
+                        <button name="open_wiki_page" type="object"
+                        string="Basic Wiki Editing" icon="gtk-ok" />
                     </group>
+
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>
                     <group col="6" colspan="4">
-                        <field name="write_date" readonly="1" select="2"/>
+                        <field name="write_date" readonly="1"/>
                         <field name="review" select="1"/>
                         <field name="toc"/>
                         <field name="tags" select="1" groups="base.group_extended"/>
-                        <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
+                        <field name="summary" colspan="4" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
@@ -250,7 +253,7 @@
             <field name="key2">tree_but_open</field>
             <field name="model">wiki.groups</field>
             <field name="name">Search a Page</field>
-            <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
+             <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
             <field eval="True" name="object"/>
         </record>
 
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 739966e5557..90b18b261ea 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -21,8 +21,7 @@
 
 import wiki_wiki_page_open
 import wiki_create_menu
-import wiki_wiki_help_open
 import wiki_make_index
-import show_diff
+import wiki_show_diff
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 3e5a87d4462..f9b0acbf273 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -12,10 +12,12 @@
               <form string="Create Menu">
     			<separator string="Menu Information" colspan="4"/>
     			<label string="Want to create a Index on Selected Pages ? "/>
-    			<separator string="" colspan="4" />
-    	        <label string="" colspan="2" />
-        	    <button special="cancel" string="Cancel" />
-            	<button name="wiki_do_index" string="Create Index" type="object"/>
+    			<separator string="" colspan="6" />
+    	        <label string="" colspan="2"/>
+    	        <group>
+        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+            	<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
+            	</group>
 			</form>
             </field>
 		</record>
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/wiki_show_diff.py
similarity index 93%
rename from addons/wiki/wizard/show_diff.py
rename to addons/wiki/wizard/wiki_show_diff.py
index 83708a8d8ce..d1a17f0fa45 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/wiki_show_diff.py
@@ -27,14 +27,13 @@ class showdiff(osv.osv_memory):
 
     _name = 'wizard.wiki.history.show_diff'
 
-    def _get_diff(self, cr, uid, ctx):
+    def get_diff(self, cr, uid, context=None):
 
         """ @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         """
-
         history = self.pool.get('wiki.wiki.history')
-        ids = ctx.get('active_ids')
+        ids = context.get('active_ids')
         diff = ""
         if len(ids) == 2:
             if ids[0] > ids[1]:
@@ -49,14 +48,15 @@ class showdiff(osv.osv_memory):
             diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
             raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
+
         return diff
 
     _columns = {
-        'diff': fields.text('Diff'), 
+        'diff': fields.text('Diff'),
     }
 
     _defaults = {
-        'diff': _get_diff
+        'diff': get_diff
     }
 
 showdiff()
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
new file mode 100644
index 00000000000..ec8fcb3ca6d
--- /dev/null
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!-- Create Index Form view  -->
+
+    	<record id="view_wiki_show_diff" model="ir.ui.view">
+            <field name="name">Show Difference</field>
+            <field name="model">wizard.wiki.history.show_diff</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Difference">
+    			 <separator colspan="4" string="Notes"/>
+    			 <field name="diff" nolabel="1" colspan="4" width="300"/>
+    	        <label string="" colspan="2" />
+    	        <group>
+        	    <button special="cancel" string="OK" icon="gtk-ok" />
+            	</group>
+			</form>
+            </field>
+		</record>
+
+<!-- Create Index Action  -->
+
+		<record id="action_view_wiki_show_diff" model="ir.actions.act_window">
+            <field name="name">Difference</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.wiki.history.show_diff</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+<!-- Create Index Action Window  -->
+
+		 <act_window id="action_view_wiki_show_diff_values"
+    		key2="client_action_multi" name="Difference"
+    		res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
deleted file mode 100644
index 226ceab271f..00000000000
--- a/addons/wiki/wizard/wiki_wiki_help_open_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- Editing Page Form view  -->
-
-    	<record id="view_wiki_wiki_help_open" model="ir.ui.view">
-            <field name="name">Basic Wiki Editing</field>
-            <field name="model">wiki.wiki.help.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Open Help">
-             	 <separator string="" colspan="6" />
-              	 <label string="" colspan="2" />
-                 <button name="open_wiki_page" string="Basic Wiki Editing" type="object"/>
-             </form>
-            </field>
-		</record>
-
-<!-- Editing Page Action  -->
-
-		<record id="action_view_wiki_wiki_help_open" model="ir.actions.act_window">
-            <field name="name">Basic Wiki Editing</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wiki.wiki.help.open</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-<!-- Editing Page Action window -->
-
-        <act_window id="action_view_wiki_wiki_help_open_vals"
-    		key2="client_action_multi" name="Basic Wiki Editing"
-    		res_model="wiki.wiki.help.open" src_model="wiki.wiki"
-    		view_mode="form" target="new" view_type="form" />
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index d65748f989a..d6b8f4f0285 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -35,18 +35,17 @@ class wiki_wiki_page_open(osv.osv_memory):
         @param ids: List of open wiki page’s IDs
         @return: dictionay of open wiki window on give group id
         """
-
-        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
-
+        group_ids = context.get('active_ids', [])
+        for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids):
             value = {
-                'domain': "[('group_id','=',%d)]" % (group.id), 
-                'name': 'Wiki Page', 
-                'view_type': 'form', 
-                'view_mode': 'form,tree', 
-                'res_model': 'wiki.wiki', 
-                'view_id': False, 
-                'type': 'ir.actions.act_window', 
-        }
+                'domain': "[('group_id','=',%d)]" % (group.id),
+                'name': 'Wiki Page',
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'wiki.wiki',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                }
         if group.method == 'page':
             value['res_id'] = group.home.id
         elif group.method == 'list':
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index d0c41d0d37f..507f3d5cdac 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -11,8 +11,13 @@
             <field name="arch" type="xml">
               <form string="Open Page">
              	<separator string="" colspan="6" />
-              	<label string="" colspan="2" />
-               	<button name="open_wiki_page" string="Open Wiki Page" type="object"/>
+              	<label string="Want to open a wiki page? "/>
+              	<separator string="" colspan="6" />
+    	        <label string="" colspan="2" />
+    	        <group>
+        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+               	<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
+               	</group>
              </form>
             </field>
 		</record>
diff --git a/addons/wiki_faq/__terp__.py b/addons/wiki_faq/__openerp__.py
similarity index 100%
rename from addons/wiki_faq/__terp__.py
rename to addons/wiki_faq/__openerp__.py
diff --git a/addons/wiki_quality_manual/__terp__.py b/addons/wiki_quality_manual/__openerp__.py
similarity index 100%
rename from addons/wiki_quality_manual/__terp__.py
rename to addons/wiki_quality_manual/__openerp__.py