[MERGE] merge with trunk

bzr revid: kbh@tinyerp.com-20120926045843-bqqhoajejxxefvk2

74 files changed, 1084 insertions, 192 deletions

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 2dc7f96768f..9889eadf387 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -447,11 +447,13 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
-        cr.execute('SELECT balance_end_real \
-                FROM account_bank_statement \
-                WHERE journal_id = %s AND NOT state = %s \
-                ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
-        res = cr.fetchone()
+        res = False
+        if journal_id:
+            cr.execute('SELECT balance_end_real \
+                    FROM account_bank_statement \
+                    WHERE journal_id = %s AND NOT state = %s \
+                    ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
+            res = cr.fetchone()
         return res and res[0] or 0.0
 
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 8f879d6b465..8f858491edc 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -392,7 +392,12 @@
             <field name="loss_account_id" model="account.account" ref="rsa" />
             <field name="internal_account_id" model="account.account" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
-            <field name="cash_control" eval="True" />
+            <!--
+                 Usually, cash payment methods requires a control at opening and closing.
+                 Bot for demo data, it's better to avoid the control step so that people
+                 that test OpenERP arrive directly in the touchscreen UI.
+            -->
+            <field name="cash_control" eval="False"/>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
@@ -426,9 +431,9 @@
             <field name="code">TUBK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field model="account.account" name="usd_debit_account_id" ref="usd_bnk"/>
-            <field model="account.account" name="usd_credit_account_id" ref="usd_bnk"/>
-            <field name="currency_id" ref="base.USD"/>
+            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="currency" ref="base.USD"/>
         </record>
         <!--
         Product income and expense accounts, default parameters
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index b1afacfbd01..1e17a504919 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -23,6 +23,7 @@
     'name': 'Calendar',
     'version': '1.0',
     'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
+    'summary': 'Personnal & Shared Agenda',
     'description': """
 This is a full-featured calendar system.
 ========================================
@@ -30,7 +31,6 @@ This is a full-featured calendar system.
 It supports:
 ------------
     - Calendar of events
-    - Alerts (create requests)
     - Recurring events
     - Invitations to people
 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 85199d09c60..73811d5ba71 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -996,7 +996,7 @@ class calendar_event(osv.osv):
         'sequence': fields.integer('Sequence'),
         'name': fields.char('Description', size=64, required=False, states={'done': [('readonly', True)]}),
         'date': fields.datetime('Date', states={'done': [('readonly', True)]}, required=True,),
-        'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}, required=True,),
+        'date_deadline': fields.datetime('End Date', states={'done': [('readonly', True)]}, required=True,),
         'create_date': fields.datetime('Created', readonly=True),
         'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d374c2e6d88..0ea2be4f37f 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -428,6 +428,5 @@
                 name="Events" parent="base.menu_calendar_configuration"
                 sequence="15" action="action_view_event"/>
 
-        <menuitem name="Agenda" id="mail_menu_agenda" parent="mail.mail_my_stuff" sequence="10" action="action_view_event"/>
      </data>
  </openerp>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b963de68130..fc936f416ad 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -87,36 +87,38 @@
                     <page string="Meeting Detail">
                         <group>
                             <group>
-                                <field name="user_id"/>
+                                <field name="date" string="Starting at"/>
+                                <label for="duration" attrs="{'invisible': [('allday','=',True)]}"/>
+                                <div attrs="{'invisible': [('allday','=',True)]}">
+                                    <field name="duration" widget="float_time"
+                                        on_change="onchange_dates(date,duration,False,allday)"
+                                        class="oe_inline"/> hours
+                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                                    <label for="allday" string="All Day?"/>)
+                                </div>
+                                <field name="date_deadline" groups="base.group_no_one"
+                                    attrs="{'invisible': [('allday','=',True)]}"
+                                    on_change="onchange_dates(date,False,date_deadline)"/>
+                            </group>
+                            <group>
+                                <field name="user_id" groups="base.group_no_one"/>
                                 <field name="categ_ids" widget="many2many_tags"/>
                                 <field name="location"/>
                                 <field name="organizer" groups="base.group_no_one"/>
                             </group>
-                            <group>
-                                <label for="date" string="Starting at"/>
-                                <div>
-                                    <field name="date"/>
-                                    <span attrs="{'invisible': [('allday','=',True)]}">
-				        (<field name="duration" widget="float_time"
-                                        on_change="onchange_dates(date,duration,False,allday)"
-                                        class="oe_inline"/> hours)
-			            </span>
 
-                                </div>
-
-                                <label for="date_deadline" />
-                                <div>
-                                    <field name="date_deadline" 
-                                        string="End Date" attrs="{'invisible': [('allday','=',True)]}"
-                                        on_change="onchange_dates(date,False,date_deadline)"/>
-                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
-                                    <label for="allday" string="All Day?"/>)
-                                </div>
-                                    <field name="recurrency"
-                                        attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
+                        </group>
+                        <label for="description"/>
+                        <field name="description"/>
+                    </page>
+                    <page string="Options">
+                        <group>
+                            <group>
+                                <field name="recurrency"
+                                    attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
                             </group>
                             <group>
-                                <field name="alarm_id" widget="selection" />
+                                <field name="alarm_id" widget="selection" groups="base.group_no_one"/>
                                 <field name="class"/>
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>
@@ -136,7 +138,7 @@
                                     <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}" class="oe_inline"/>
                                 </div>
                                 <label string="Select Weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}"/>
-                                <group col="4" colspan="1" name="weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                <group col="2" colspan="1" name="weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                     <field name="mo" />
                                     <field name="tu" />
                                     <field name="we" />
@@ -162,8 +164,6 @@
 
                             </group>
                         </group>
-                        <label for="description"/>
-                        <field name="description"/>
                     </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
@@ -339,7 +339,11 @@
     </record>
 
     <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Meetings" action="action_crm_meeting"/>
+        name="Agenda" action="action_crm_meeting"/>
+
+    <menuitem name="Agenda"
+        id="mail_menu_agenda" parent="mail.mail_my_stuff"
+        sequence="10" action="action_crm_meeting"/>
 
     </data>
 </openerp>
diff --git a/addons/caldav/i18n/bn.po b/addons/caldav/i18n/bn.po
new file mode 100644
index 00000000000..93281058908
--- /dev/null
+++ b/addons/caldav/i18n/bn.po
@@ -0,0 +1,819 @@
+# Bengali translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-25 17:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali <bn@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: 2012-09-26 04:36+0000\n"
+"X-Generator: Launchpad (build 16022)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:99
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav)\n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"\n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide Path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,help:caldav.action_caldav_form
+msgid ""
+"\"Calendars\" allow you to Customize calendar event and todo attribute with "
+"any of OpenERP model.Caledars provide iCal Import/Export "
+"functionality.Webdav server that provides remote access to calendar.Help You "
+"to synchronize Meeting with Calendars client.You can access Calendars using "
+"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#: code:addons/caldav/calendar.py:879
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:123
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form\n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:879
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Caldav's host name configuration"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Datetime In UTC"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Webcal Calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Next"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Configure your openerp hostname. For example : "
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:815
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS File"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:141
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse Caldav"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,host_name:0
+msgid "Host Name"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "My Calendar(s)"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "database.my.openerp.com  or companyserver.com"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:50
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name\n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths.\n"
+"\n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.\n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index fab81c37340..437270b4bfb 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-30 17:52+0000\n"
+"PO-Revision-Date: 2012-09-25 09:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
-"X-Generator: Launchpad (build 15887)\n"
+"X-Launchpad-Export-Date: 2012-09-26 04:36+0000\n"
+"X-Generator: Launchpad (build 16022)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -50,7 +50,7 @@ msgstr "Видимость"
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Заголовок"
+msgstr "Обращение"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -102,7 +102,7 @@ msgstr "Название этапа"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM анализ кандидатов"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -130,7 +130,7 @@ msgstr "Кандидат '%s'  был закрыт"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Ожид. закрытие"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -140,7 +140,7 @@ msgstr "Ежегодно"
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "День создания"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -167,7 +167,7 @@ msgstr "Искать предложения"
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Ожидаемый месяц закрытия"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -218,7 +218,7 @@ msgstr "Отказ"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Прекращение повторений"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -252,7 +252,7 @@ msgstr "Критерии"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr "Исключенные ответы"
+msgstr "Исключенные ответы :"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -402,7 +402,7 @@ msgstr "Дата изменения"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "Лидер команды"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -432,7 +432,7 @@ msgstr "Категория"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "Предложение / Заказчик"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -454,6 +454,12 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Этапы позволят продавцу легко отследить как конкретное предложение "
+"позиционировано в цикле продаж. Для того, чтобы эффективно управлять вашим "
+"потоком продаж, важно определить условия для перехода к следующему шагу. "
+"Пример: для задания предложения как 'Подходящее', вы должны задать "
+"\"Ожидаемый доход\" и \"Ожидаемую дату закрытия\". Вы должны взглянуть на "
+"поле совета \"Автоматическая смена вероятности\"."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -478,7 +484,7 @@ msgstr "Обычная встреча или звонок по предложе�
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "Шлюз почты"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -513,7 +519,7 @@ msgstr "Рассылки"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "Сделать"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -525,7 +531,7 @@ msgstr "Июнь"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "Не выполняется"
+msgstr "Не запущено"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -581,7 +587,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Название контакта партнёра"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -606,7 +612,7 @@ msgstr "Опции профилирования"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "# Телефонные звонки"
+msgstr "# Телефонных звонков"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -640,7 +646,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -695,7 +701,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -705,7 +711,7 @@ msgstr "Вероятная выручка"
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -720,7 +726,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr "Валюта организации"
+msgstr "Валюта компании"
 
 #. module: crm
 #: view:crm.lead:0
@@ -736,6 +742,12 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Определите отделы продаж для структурирования организации продаж и назначьте "
+"пользователей в каждый отдел. Также вы должны определить этап продаж для "
+"каждого отдела. Как пример, если вы используете технику решений продаж для "
+"отслеживания ваших предложений, вы можете назначить следующие этапы для "
+"отдела: территория, подходящий, подходящие спонсоры, предположение, "
+"переговоры, выигран/проигран."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -748,7 +760,7 @@ msgstr "Предложение"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "Кандидаты/Предложения за прошлый месяц"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -807,17 +819,19 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"Вы не можете удалить кандидата '%s'; для удаления он должна быть в состоянии "
+"'Черновик'. Вам лучше отменить его, вместо удаления."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "От %s : %s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "Год создания"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -838,7 +852,7 @@ msgstr "Продажи Закупки"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "Используется для подсчёта открытых дней"
 
 #. module: crm
 #: view:crm.lead:0
@@ -872,7 +886,7 @@ msgstr "Повторяющаяся встреча"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Нераспределенные звонки"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -958,7 +972,7 @@ msgstr "<"
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "Моб. тел."
+msgstr "Мобильный"
 
 #. module: crm
 #: view:crm.lead:0
@@ -973,7 +987,7 @@ msgstr "Мои встречи"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr "Звонки за сегодня"
+msgstr "Сегодняшние звонки"
 
 #. module: crm
 #: view:board.board:0
@@ -1016,7 +1030,7 @@ msgstr "Повторять до"
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "Срок"
+msgstr "Конечный срок"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1046,7 +1060,7 @@ msgstr "Ответственный"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "Показать только предложения"
 
 #. module: crm
 #: view:res.partner:0
@@ -1056,7 +1070,7 @@ msgstr "Предыдущий"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "Новые кандидаты"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1071,12 +1085,12 @@ msgstr "От"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "Преобразовать в предложения"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "Показать отдел продаж"
 
 #. module: crm
 #: view:res.partner:0
@@ -1134,7 +1148,7 @@ msgstr "Дата создания"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Мои предложения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1144,7 +1158,7 @@ msgstr "Нужен дизайн сайта"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "Год звонка"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1190,7 +1204,7 @@ msgstr "Отметить как"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "Описание звонка"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1205,7 +1219,7 @@ msgstr "Поля, зависящие от состояния"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "Звонки в состоянии \"В ожидании\""
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1248,7 +1262,7 @@ msgstr "Макс. ID обработанного партнера"
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "Задание этого этапа автоматически изменит вероятность в предложении."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1280,7 +1294,7 @@ msgstr "Название предложения"
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "День ожидаемого закрытия"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1302,6 +1316,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1345,7 +1361,7 @@ msgstr "Установить сигнал на это время, перед с�
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr "Назначить звонок"
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1371,6 +1387,13 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Состояние установлено в 'Сделать', когда вопрос создан.                      "
+"            \\n\n"
+"Если вопрос в процессе, состояние установлено в 'Открыт'.                    "
+"              \\n\n"
+"Когда звонок выполнен, задаётся состояние 'Произведён'.                      "
+"            \\n\n"
+"Если звонок нуждается в выполнении, то задаётся состояние 'Не произведён'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1413,7 +1436,7 @@ msgstr "Расширенные фильтры..."
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "Телефонные звонки , которые находятся в закрытом состоянии"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1428,7 +1451,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Подразделение маркетинга продаж"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1440,6 +1463,8 @@ msgstr "Дата звонка"
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
+"При отправке почты,адрес электронной почты по умолчанию берется из отдела "
+"продаж."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1461,12 +1486,12 @@ msgstr "Запланировать встречу"
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Объединенные предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "Определить отдел продаж"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1493,7 +1518,7 @@ msgstr "Подотделы"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "Звонки в состоянии черновик или открыто"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -1523,7 +1548,7 @@ msgstr "res.users"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Кандидаты/Предложения в состоянии \"В ожидании\""
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1544,7 +1569,7 @@ msgstr ""
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1559,12 +1584,12 @@ msgstr "Категории звонков"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Открытые Кандидаты/Предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "Предложения по категориям"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1572,6 +1597,8 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Имя будущего партнера, который будет создан в процессе преобразования "
+"кандидата в предложение"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1582,13 +1609,13 @@ msgstr "Ошибка ! Вы не можете создать рекурсивн�
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "Описание звонка"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "Не связывать с партнёром"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1619,7 +1646,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
-"Анализ предложений дает вам мгновенный доступ к такой информации, как "
+"Анализ предложений дает вам мгновенный доступ к такой информации как: "
 "ожидаемый доход, плановая себестоимость, пропущенные сроки или количество "
 "взаимодействий в предложении. Этот отчет в основном используется менеджером "
 "по продажам, с тем чтобы сделать периодический обзор по отделам продаж в "
@@ -1644,13 +1671,13 @@ msgid ""
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
 "Добавление специальных этапов к кандидатам и предложениям позволяет лучше "
-"организовать процесс продаж. Этапы позволяют легче отслеживать нахождение "
+"организовать процесс продаж. Этапы позволяют легче отслеживать положение "
 "кандидатов и предложений в процессе продаж."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "Преобразовать предложения"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -1687,7 +1714,7 @@ msgstr "Преобразовать в возможного бизнес-парт
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "Встреча / Партнер"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1719,7 +1746,7 @@ msgstr "Пятый"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Кандидаты/предложения в сделанном состоянии"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1740,7 +1767,7 @@ msgstr "Возможный посредник"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "При обострении для этого отдела, продавец заменяется на начальника."
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1798,7 +1825,7 @@ msgstr "Входящие"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "Месяц звонка"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1831,7 +1858,7 @@ msgstr "Наивысший"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "Год создания"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
@@ -1857,7 +1884,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr "Имя заказчика"
+msgstr "Название заказчика"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
@@ -1887,7 +1914,7 @@ msgstr "Опция повторения"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Кандидат / Заказчик"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1912,12 +1939,12 @@ msgstr "Каналы"
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr "Приостановлено"
+msgstr "Произведен"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "Установить в \"черновик\""
+msgstr "Установить в \"Черновик\""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1977,7 +2004,7 @@ msgstr "Использовать правила продаж покупок"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Кандидат в партнера предложения"
+msgstr "Кандидат в предложение партнеру"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
@@ -1987,7 +2014,7 @@ msgstr "Расположение"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Массовое проведение предложений партнёру"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2027,7 +2054,7 @@ msgstr "Планируемая Дата"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr "Caldav URL"
+msgstr "Адрес Caldav"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2042,7 +2069,7 @@ msgstr "Имя контакта"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Кандидаты, созданные за последние 7 дней"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2074,7 +2101,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Показать только кандидата"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2102,18 +2129,18 @@ msgstr "Классификация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr "Группа"
+msgstr "Команда"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Кандидаты/Предложения в стадии \"Новый\""
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr "Не проведено"
+msgstr "Не произведен"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2123,13 +2150,13 @@ msgstr "Вероятность"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Предложения в состоянии \"В ожидании\""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите более одного кандидата из списка."
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2246,7 +2273,7 @@ msgstr "Всего запланированная выручка"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Открытые предложения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2282,7 +2309,7 @@ msgstr "Телефонные звонки"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Поиск этапа"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
@@ -2292,7 +2319,7 @@ msgstr "Количество дней на открытие вопроса"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "Количество повторов"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2336,7 +2363,7 @@ msgstr "Неопределенный"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Используется для упорядочения этапов."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2360,12 +2387,12 @@ msgstr "Уменьшить (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Ожид. день закрытия"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Переназначить обостренное"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -2396,6 +2423,8 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Вы не можете обострить, вы уже на высшем уровне относительно вашей категории "
+"отдела продаж."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
@@ -2410,7 +2439,7 @@ msgstr "Сделано"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Повтор каждый (День/Неделя/Месяц/Год)"
+msgstr "Повтор каждый (День/Неделю/Месяц/Год)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2442,7 +2471,7 @@ msgstr "Занят"
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "День создания"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -2457,7 +2486,7 @@ msgstr "Повторяющийся"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Звонки, сделанные за последний месяц"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
@@ -2472,7 +2501,7 @@ msgstr "Максимальная история общения"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr "Пригласить"
+msgstr "Пригласить людей"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
@@ -2491,8 +2520,8 @@ msgid ""
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 "Состояние  установлено в 'Черновик', при создании вопроса.       \n"
-"Если вопрос в работе состояние  установлено в 'Открыто'.            \n"
-"Когда вопрос  решен состояние  установлено в 'Сделано'.              \n"
+"Если вопрос в работе, состояние  установлено в 'Открыто'.            \n"
+"Когда вопрос  решен, состояние  установлено в 'Сделано'.              \n"
 "Если вопрос нуждается в рассмотрении, то состояние 'В ожидании'."
 
 #. module: crm
@@ -2517,7 +2546,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Нераспределенные предложения"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2561,6 +2590,8 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Из какой кампании поступил этот контакт (семинар, маркетинговая кампания, "
+"массовая рассылка, ...)?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2585,7 +2616,7 @@ msgstr "Продолжение процесса"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Кандидаты/Предложения созданные в этом году"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -2613,17 +2644,17 @@ msgstr "Последнее действие"
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr "Продолжительность"
+msgstr "Длительность"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Показать страны"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Выберите продавца"
 
 #. module: crm
 #: view:board.board:0
@@ -2638,7 +2669,7 @@ msgstr "кол-во вопросов"
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr "Отдел продаж, которому принадлежат вопросы."
+msgstr "Отдел продаж, которому принадлежит вопрос."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2659,7 +2690,7 @@ msgstr "Не изменен"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr "Сегментация партнеров"
+msgstr "Классификация партнеров"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2669,7 +2700,7 @@ msgstr "Факс"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Кандидаты/Предложения созданные в этом месяце"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2681,7 +2712,7 @@ msgstr "Назначение"
 #: field:crm.lead.report,company_id:0 field:crm.phonecall,company_id:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr "Организация"
+msgstr "Компания"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2701,7 +2732,7 @@ msgstr "Обязательно / Опционально"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Нераспределенные кандидаты"
 
 #. module: crm
 #: field:crm.lead,subjects:0
@@ -2761,7 +2792,7 @@ msgstr "Сообщения"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Канал общения (почта, телефон, напрямую, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -2839,7 +2870,7 @@ msgid ""
 msgstr ""
 "Создавать специальные категории, которые подходят к деятельности вашей "
 "компании, чтобы лучше классифицировать и анализировать ваших кандидатов и "
-"предложения. Такие категории, могут, например, отражать вашу структуру "
+"предложения. Такие категории могут, например, отражать вашу структуру "
 "продукции или различные типы продаж."
 
 #. module: crm
@@ -2872,12 +2903,12 @@ msgstr "# Писем"
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr "Отчет о звонках"
+msgstr "Описание звонка"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Сегодняшние кандидаты"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2888,6 +2919,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Запланированные звонки перечисляют все звонки, которые будут сделаны вашим "
+"отделом продаж. Продавец может записать информацию о звонке в форме ввода. "
+"Эта информация будет сохранена в форме ввода партнёра для отслеживания "
+"каждого вашего контакта с покупателем. Также вы можете импортировать .CSV-"
+"файл со списком звонков, которые будут сделаны вашим отделом продаж."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2913,7 +2949,7 @@ msgstr "Подтверждено"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Планируемые поступления по пользователю и этапу"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2943,7 +2979,7 @@ msgstr "День месяца"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Планируемая выручка по этапу"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -2967,7 +3003,7 @@ msgstr "Канал"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Мои отделы продаж"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2977,8 +3013,8 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
-"Отметьте, если категория ограничена контрагентами, подпадающими под критерии "
-"сегментации.                        \n"
+"Отметьте, если категория ограничена партнерами, подпадающими под критерии "
+"классификации.                        \n"
 "Если отмечено, из категории будут удалёны контрагенты, не подпадающие под "
 "эти критерии."
 
@@ -2993,7 +3029,7 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
-"Последний срок автоматически вычисляются как \"Дата начала\" + "
+"Последний срок автоматически вычисляется как \"Дата начала\" + "
 "\"Длительность\""
 
 #. module: crm
@@ -3030,7 +3066,7 @@ msgstr "Установить категорию в"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "Кому:"
 
 #. module: crm
 #: field:crm.meeting,th:0
@@ -3052,7 +3088,7 @@ msgstr "Ежедневно"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Обзор этапов продаж"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -3062,13 +3098,13 @@ msgstr "Уточнение"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Контактный e-mail партнёра"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "Партнёр уже существует."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3078,7 +3114,7 @@ msgstr "Первый"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "Ожид. месяц закрытия"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3090,7 +3126,7 @@ msgstr "Декабрь"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr "Условие на историю общения"
+msgstr "Условие для истории общения"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3109,7 +3145,7 @@ msgid ""
 "Use this functionality for recurring businesses."
 msgstr ""
 "Период - среднее количество дней между двумя циклами продаж или покупок для "
-"этой сегментации.                 \n"
+"этой классификации.                 \n"
 "Это, главным образом, используется для обнаружения слишком длительного "
 "периода за который партнер ничего не покупал,       \n"
 "поэтому мы предполагаем, что его мнение ухудшилось, потому что он, вероятно, "
@@ -3130,7 +3166,7 @@ msgstr "Сб"
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "Менеджер продаж"
+msgstr "Продавец"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
@@ -3155,12 +3191,12 @@ msgstr "Повторить"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "Ожид. год закрытия"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr "Имя партнера"
+msgstr "Название партнера"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3211,7 +3247,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "Описанные звонки"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3275,7 +3311,7 @@ msgstr "Нормальный"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Закрытые/Отмененные кандидаты нельзя преобразовать в предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3339,12 +3375,12 @@ msgstr "Реклама в Twitter"
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "Предложение '%s' выиграно."
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3370,7 +3406,7 @@ msgstr "Ошибка ! Вы не можете создать зацикленн�
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Ожидаемый год закрытия"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
@@ -3448,7 +3484,7 @@ msgstr "Личный"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Общий для работников"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3487,13 +3523,13 @@ msgstr "Интерес к аксессуарам"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Новые предложения"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Не найден e-mail для адреса вашей компании!"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3513,7 +3549,7 @@ msgstr "Предложения по пользователям и отделам
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Установить в \"Сделать\""
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3595,6 +3631,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Этот инструмент позволяет вам описывать входящие звонки на лету. Каждый "
+"получаемый вами звонок будет появляться в форме партнёра для отслеживания "
+"каждого вашего контакта с партнёром. Из формы телефонного звонка вы можете "
+"запустить запрос другого звонка, встречу или предложение."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3653,7 +3693,7 @@ msgstr "Ожид.Закр."
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
@@ -4512,9 +4552,6 @@ msgstr "Рассылка"
 #~ msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 #~ msgstr "Закрытый/отмененный звонок нельзя преобразовать в предложение"
 
-#~ msgid "Opportunity to Quotation"
-#~ msgstr "Предложение в Заказ на продажу"
-
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Кандидат в Предложение"
 
@@ -4601,3 +4638,15 @@ msgstr "Рассылка"
 
 #~ msgid "Message Body"
 #~ msgstr "Тело сообщения"
+
+#~ msgid "Schedule/Log a call"
+#~ msgstr "Планировать/Описать звонок"
+
+#~ msgid "Schedule call"
+#~ msgstr "Запланировать звонок"
+
+#~ msgid "Opportunity to Quotation"
+#~ msgstr "Предложение в Запрос цен"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Предложения назначены"
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 4d301bfafe4..c2ccf511e3c 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -57,7 +57,7 @@ Wizards provided by this module:
         'base_vat',
         'base_iban',
         'account_chart',
-        'account_coda',
+        'l10n_be_coda',
     ],
     'data': [
         'account_financial_report.xml',
diff --git a/addons/account_coda/README.txt b/addons/l10n_be_coda/README.txt
index 75f8a232566..75f8a232566 100644
--- a/addons/account_coda/README.txt
+++ b/addons/l10n_be_coda/README.txt
diff --git a/addons/account_coda/__init__.py b/addons/l10n_be_coda/__init__.py
index 2750c8ff4a8..4a58b8ad059 100644
--- a/addons/account_coda/__init__.py
+++ b/addons/l10n_be_coda/__init__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import account_coda
+import l10n_be_coda
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py
index 03527eaa2ec..bd323478886 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/l10n_be_coda/__openerp__.py
@@ -93,14 +93,14 @@ If required, you can manually adjust the descriptions via the CODA configuration
     'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
     'demo': [],
     'data': [
-        'account_coda_trans_type.xml',
-        'account_coda_trans_code.xml',
-        'account_coda_trans_category.xml',
-        'account_coda_comm_type.xml',
+        'l10n_be_coda_trans_type.xml',
+        'l10n_be_coda_trans_code.xml',
+        'l10n_be_coda_trans_category.xml',
+        'l10n_be_coda_comm_type.xml',
         'security/ir.model.access.csv',
         'security/account_security.xml',
-        'account_coda_wizard.xml',
-        'account_coda_view.xml',
+        'l10n_be_coda_wizard.xml',
+        'l10n_be_coda_view.xml',
     ],
     'auto_install': False,
     'installable': True,
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/l10n_be_coda/i18n/account_coda.pot
index 72ad4d8aafb..72ad4d8aafb 100644
--- a/addons/account_coda/i18n/account_coda.pot
+++ b/addons/l10n_be_coda/i18n/account_coda.pot
diff --git a/addons/account_coda/i18n/ar.po b/addons/l10n_be_coda/i18n/ar.po
index ff41c707eb6..ff41c707eb6 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/l10n_be_coda/i18n/ar.po
diff --git a/addons/account_coda/i18n/bg.po b/addons/l10n_be_coda/i18n/bg.po
index ab70a689bce..ab70a689bce 100644
--- a/addons/account_coda/i18n/bg.po
+++ b/addons/l10n_be_coda/i18n/bg.po
diff --git a/addons/account_coda/i18n/ca.po b/addons/l10n_be_coda/i18n/ca.po
index 025b0e8b3de..025b0e8b3de 100644
--- a/addons/account_coda/i18n/ca.po
+++ b/addons/l10n_be_coda/i18n/ca.po
diff --git a/addons/account_coda/i18n/da.po b/addons/l10n_be_coda/i18n/da.po
index 326f161053d..326f161053d 100644
--- a/addons/account_coda/i18n/da.po
+++ b/addons/l10n_be_coda/i18n/da.po
diff --git a/addons/account_coda/i18n/de.po b/addons/l10n_be_coda/i18n/de.po
index 69734f33073..69734f33073 100644
--- a/addons/account_coda/i18n/de.po
+++ b/addons/l10n_be_coda/i18n/de.po
diff --git a/addons/account_coda/i18n/el.po b/addons/l10n_be_coda/i18n/el.po
index 4dc165df765..4dc165df765 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/l10n_be_coda/i18n/el.po
diff --git a/addons/account_coda/i18n/en_GB.po b/addons/l10n_be_coda/i18n/en_GB.po
index cf5adf963e3..cf5adf963e3 100644
--- a/addons/account_coda/i18n/en_GB.po
+++ b/addons/l10n_be_coda/i18n/en_GB.po
diff --git a/addons/account_coda/i18n/es.po b/addons/l10n_be_coda/i18n/es.po
index 97c53948db9..97c53948db9 100644
--- a/addons/account_coda/i18n/es.po
+++ b/addons/l10n_be_coda/i18n/es.po
diff --git a/addons/account_coda/i18n/es_CR.po b/addons/l10n_be_coda/i18n/es_CR.po
index 0a8d3fd36fb..0a8d3fd36fb 100644
--- a/addons/account_coda/i18n/es_CR.po
+++ b/addons/l10n_be_coda/i18n/es_CR.po
diff --git a/addons/account_coda/i18n/es_EC.po b/addons/l10n_be_coda/i18n/es_EC.po
index a54086b3a47..a54086b3a47 100644
--- a/addons/account_coda/i18n/es_EC.po
+++ b/addons/l10n_be_coda/i18n/es_EC.po
diff --git a/addons/account_coda/i18n/es_MX.po b/addons/l10n_be_coda/i18n/es_MX.po
index a51a1ea4036..a51a1ea4036 100644
--- a/addons/account_coda/i18n/es_MX.po
+++ b/addons/l10n_be_coda/i18n/es_MX.po
diff --git a/addons/account_coda/i18n/es_PY.po b/addons/l10n_be_coda/i18n/es_PY.po
index 25dfc601801..25dfc601801 100644
--- a/addons/account_coda/i18n/es_PY.po
+++ b/addons/l10n_be_coda/i18n/es_PY.po
diff --git a/addons/account_coda/i18n/es_VE.po b/addons/l10n_be_coda/i18n/es_VE.po
index a51a1ea4036..a51a1ea4036 100644
--- a/addons/account_coda/i18n/es_VE.po
+++ b/addons/l10n_be_coda/i18n/es_VE.po
diff --git a/addons/account_coda/i18n/et.po b/addons/l10n_be_coda/i18n/et.po
index f2a628a9b6f..f2a628a9b6f 100644
--- a/addons/account_coda/i18n/et.po
+++ b/addons/l10n_be_coda/i18n/et.po
diff --git a/addons/account_coda/i18n/fa.po b/addons/l10n_be_coda/i18n/fa.po
index 581f1dd1135..581f1dd1135 100644
--- a/addons/account_coda/i18n/fa.po
+++ b/addons/l10n_be_coda/i18n/fa.po
diff --git a/addons/account_coda/i18n/fi.po b/addons/l10n_be_coda/i18n/fi.po
index 35326f14129..35326f14129 100644
--- a/addons/account_coda/i18n/fi.po
+++ b/addons/l10n_be_coda/i18n/fi.po
diff --git a/addons/account_coda/i18n/fr.po b/addons/l10n_be_coda/i18n/fr.po
index d94508963bf..d94508963bf 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/l10n_be_coda/i18n/fr.po
diff --git a/addons/account_coda/i18n/gl.po b/addons/l10n_be_coda/i18n/gl.po
index f4f23076851..f4f23076851 100644
--- a/addons/account_coda/i18n/gl.po
+++ b/addons/l10n_be_coda/i18n/gl.po
diff --git a/addons/account_coda/i18n/hr.po b/addons/l10n_be_coda/i18n/hr.po
index 76d310c97c1..76d310c97c1 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/l10n_be_coda/i18n/hr.po
diff --git a/addons/account_coda/i18n/hu.po b/addons/l10n_be_coda/i18n/hu.po
index f4b9eb3b99f..f4b9eb3b99f 100644
--- a/addons/account_coda/i18n/hu.po
+++ b/addons/l10n_be_coda/i18n/hu.po
diff --git a/addons/account_coda/i18n/it.po b/addons/l10n_be_coda/i18n/it.po
index 301969ee5a3..301969ee5a3 100644
--- a/addons/account_coda/i18n/it.po
+++ b/addons/l10n_be_coda/i18n/it.po
diff --git a/addons/account_coda/i18n/ja.po b/addons/l10n_be_coda/i18n/ja.po
index 966108f723f..966108f723f 100644
--- a/addons/account_coda/i18n/ja.po
+++ b/addons/l10n_be_coda/i18n/ja.po
diff --git a/addons/account_coda/i18n/lv.po b/addons/l10n_be_coda/i18n/lv.po
index b9248a496d9..b9248a496d9 100644
--- a/addons/account_coda/i18n/lv.po
+++ b/addons/l10n_be_coda/i18n/lv.po
diff --git a/addons/account_coda/i18n/mn.po b/addons/l10n_be_coda/i18n/mn.po
index 7fbac7e3d52..7fbac7e3d52 100644
--- a/addons/account_coda/i18n/mn.po
+++ b/addons/l10n_be_coda/i18n/mn.po
diff --git a/addons/account_coda/i18n/nb.po b/addons/l10n_be_coda/i18n/nb.po
index 1cf83112c68..1cf83112c68 100644
--- a/addons/account_coda/i18n/nb.po
+++ b/addons/l10n_be_coda/i18n/nb.po
diff --git a/addons/account_coda/i18n/nl.po b/addons/l10n_be_coda/i18n/nl.po
index 16ade0959be..16ade0959be 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/l10n_be_coda/i18n/nl.po
diff --git a/addons/account_coda/i18n/nl_BE.po b/addons/l10n_be_coda/i18n/nl_BE.po
index eeaf5f8b390..eeaf5f8b390 100644
--- a/addons/account_coda/i18n/nl_BE.po
+++ b/addons/l10n_be_coda/i18n/nl_BE.po
diff --git a/addons/account_coda/i18n/pl.po b/addons/l10n_be_coda/i18n/pl.po
index bea064ede8c..bea064ede8c 100644
--- a/addons/account_coda/i18n/pl.po
+++ b/addons/l10n_be_coda/i18n/pl.po
diff --git a/addons/account_coda/i18n/pt.po b/addons/l10n_be_coda/i18n/pt.po
index 23067828058..23067828058 100644
--- a/addons/account_coda/i18n/pt.po
+++ b/addons/l10n_be_coda/i18n/pt.po
diff --git a/addons/account_coda/i18n/pt_BR.po b/addons/l10n_be_coda/i18n/pt_BR.po
index 206867b7883..206867b7883 100644
--- a/addons/account_coda/i18n/pt_BR.po
+++ b/addons/l10n_be_coda/i18n/pt_BR.po
diff --git a/addons/account_coda/i18n/ro.po b/addons/l10n_be_coda/i18n/ro.po
index 1cffea4dcae..1cffea4dcae 100644
--- a/addons/account_coda/i18n/ro.po
+++ b/addons/l10n_be_coda/i18n/ro.po
diff --git a/addons/account_coda/i18n/ru.po b/addons/l10n_be_coda/i18n/ru.po
index 71ae1f08f0e..71ae1f08f0e 100644
--- a/addons/account_coda/i18n/ru.po
+++ b/addons/l10n_be_coda/i18n/ru.po
diff --git a/addons/account_coda/i18n/sl.po b/addons/l10n_be_coda/i18n/sl.po
index 158d2473d02..158d2473d02 100644
--- a/addons/account_coda/i18n/sl.po
+++ b/addons/l10n_be_coda/i18n/sl.po
diff --git a/addons/account_coda/i18n/sq.po b/addons/l10n_be_coda/i18n/sq.po
index 35ccfab0318..35ccfab0318 100644
--- a/addons/account_coda/i18n/sq.po
+++ b/addons/l10n_be_coda/i18n/sq.po
diff --git a/addons/account_coda/i18n/sr.po b/addons/l10n_be_coda/i18n/sr.po
index 34bda7f5a7e..34bda7f5a7e 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/l10n_be_coda/i18n/sr.po
diff --git a/addons/account_coda/i18n/sr@latin.po b/addons/l10n_be_coda/i18n/sr@latin.po
index 3012358cd53..3012358cd53 100644
--- a/addons/account_coda/i18n/sr@latin.po
+++ b/addons/l10n_be_coda/i18n/sr@latin.po
diff --git a/addons/account_coda/i18n/sv.po b/addons/l10n_be_coda/i18n/sv.po
index 7e0dd077e0c..7e0dd077e0c 100644
--- a/addons/account_coda/i18n/sv.po
+++ b/addons/l10n_be_coda/i18n/sv.po
diff --git a/addons/account_coda/i18n/tr.po b/addons/l10n_be_coda/i18n/tr.po
index ee1de51f805..ee1de51f805 100644
--- a/addons/account_coda/i18n/tr.po
+++ b/addons/l10n_be_coda/i18n/tr.po
diff --git a/addons/account_coda/i18n/vi.po b/addons/l10n_be_coda/i18n/vi.po
index 39e6fcd2f52..39e6fcd2f52 100644
--- a/addons/account_coda/i18n/vi.po
+++ b/addons/l10n_be_coda/i18n/vi.po
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/l10n_be_coda/i18n/zh_CN.po
index 459a535dd2d..459a535dd2d 100644
--- a/addons/account_coda/i18n/zh_CN.po
+++ b/addons/l10n_be_coda/i18n/zh_CN.po
diff --git a/addons/account_coda/i18n/zh_TW.po b/addons/l10n_be_coda/i18n/zh_TW.po
index 175da4eb6d2..175da4eb6d2 100644
--- a/addons/account_coda/i18n/zh_TW.po
+++ b/addons/l10n_be_coda/i18n/zh_TW.po
diff --git a/addons/account_coda/account_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
index 1aa6e84402a..1aa6e84402a 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/l10n_be_coda/l10n_be_coda.py
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/l10n_be_coda/l10n_be_coda_comm_type.xml
index 9a042ec48d2..9a042ec48d2 100644
--- a/addons/account_coda/account_coda_comm_type.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_comm_type.xml
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/l10n_be_coda/l10n_be_coda_trans_category.xml
index 192240cf8aa..192240cf8aa 100644
--- a/addons/account_coda/account_coda_trans_category.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_trans_category.xml
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/l10n_be_coda/l10n_be_coda_trans_code.xml
index b2b23d59bef..b2b23d59bef 100644
--- a/addons/account_coda/account_coda_trans_code.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_trans_code.xml
diff --git a/addons/account_coda/account_coda_trans_type.xml b/addons/l10n_be_coda/l10n_be_coda_trans_type.xml
index 9be29ce622a..9be29ce622a 100644
--- a/addons/account_coda/account_coda_trans_type.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_trans_type.xml
diff --git a/addons/account_coda/account_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml
index 21db77466a0..21db77466a0 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_view.xml
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml
index 76178820d9c..76178820d9c 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_wizard.xml
diff --git a/addons/account_coda/security/account_security.xml b/addons/l10n_be_coda/security/account_security.xml
index b8fdd32ebe6..b8fdd32ebe6 100644
--- a/addons/account_coda/security/account_security.xml
+++ b/addons/l10n_be_coda/security/account_security.xml
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/l10n_be_coda/security/ir.model.access.csv
index 89ee65048fb..89ee65048fb 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/l10n_be_coda/security/ir.model.access.csv
diff --git a/addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
index bc3af59e322..bc3af59e322 100644
--- a/addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
+++ b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
diff --git a/addons/account_coda/wizard/__init__.py b/addons/l10n_be_coda/wizard/__init__.py
index e3038609b80..e3038609b80 100644
--- a/addons/account_coda/wizard/__init__.py
+++ b/addons/l10n_be_coda/wizard/__init__.py
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index bb46593b158..ca89cf78325 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -942,7 +942,7 @@ class account_coda_import(osv.osv_memory):
     def action_open_coda_statements(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        module, xml_id = 'account_coda', 'action_coda_bank_statements'
+        module, xml_id = 'l10n_be_coda', 'action_coda_bank_statements'
         res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id)
         action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context)
         domain = eval(action.get('domain') or '[]')
@@ -973,9 +973,9 @@ def str2float(str):
         return 0.0
 
 def list2float(lst):
-            try:
-                return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
-            except:
-                return 0.0
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index f27b76a5bca..62a32a526c3 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -33,7 +33,6 @@ Accounting chart and localization for Ecuador.
         'base_vat',
         'base_iban',
         'account_chart',
-        'account_coda',
     ],
     'data': [
         'account_tax_code.xml',
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index cec2e513a6a..adeab4f0ab4 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -49,9 +49,9 @@ class account_bilan_report(osv.osv_memory):
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
 
 account_bilan_report()
 
-# 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/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index d90466ea6c4..f3833b372c4 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -49,9 +49,9 @@ class account_cdr_report(osv.osv_memory):
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
 
 account_cdr_report()
 
-# 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/mail/mail_group.py b/addons/mail/mail_group.py
index fe0cc3950ae..60e3b9bd3af 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -23,7 +23,7 @@ import openerp
 import openerp.tools as tools
 from osv import osv
 from osv import fields
-
+from openerp import SUPERUSER_ID
 
 class mail_group(osv.Model):
     """ A mail_group is a collection of users sharing messages in a discussion
@@ -116,7 +116,10 @@ class mail_group(osv.Model):
                           model_name=self._name, context=context)
             vals['alias_id'] = alias_id
 
-        mail_group_id = super(mail_group, self).create(cr, uid, vals, context)
+        #check access rights for the current user, then create as SUPERUSER because the object inherits
+        #ir.ui.menu (for which normal users do not have creation rights)
+        self.check_access_rights(cr, uid, 'create')
+        mail_group_id = super(mail_group, self).create(cr, SUPERUSER_ID, vals, context=context)
 
         # Create client action for this group and link the menu to it
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
@@ -130,8 +133,8 @@ class mail_group(osv.Model):
                 'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
-            newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
-            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
+            newref = cobj.copy(cr, SUPERUSER_ID, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
+            self.write(cr, SUPERUSER_ID, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
 
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 31beba80ecc..a551a549b06 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -61,7 +61,7 @@
                             <div class="oe_edit_only">
                                 <label for="name" string="Group Name"/>
                             </div>
-                            <h1><field name="name"/></h1>
+                            <h1><field name="name" readonly="0"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_id" invisible="1" required="0"/>
                                     <label for="alias_name" class="oe_edit_only"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 9c92145ed89..d9836527013 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -863,6 +863,8 @@
                 <form string="Point of Sale Session" version="7.0">
                     <header>
                         <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
+                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"
+                            class="oe_highlight"/>
                         <button name="cashbox_control" type="workflow" string="End of Session"
                             attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '!=', 'opened')]}" 
                             class="oe_highlight" />
@@ -871,7 +873,6 @@
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
                             class="oe_highlight" />
-                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
                         </div>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 332a21895f2..2a03a7befc4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -709,6 +709,15 @@ class stock_picking(osv.osv):
             for move in picking_obj.move_lines:
                 move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False, 'move_history_ids2': [(6, 0, [])], 'move_history_ids': [(6, 0, [])]})
         return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if view_type == 'form' and not view_id:
+            mod_obj = self.pool.get('ir.model.data')
+            if self._name == "stock.picking.in":
+                model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+            if self._name == "stock.picking.out":
+                model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
+        return super(stock_picking,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
     def onchange_partner_in(self, cr, uid, context=None, partner_id=None):
         return {}
@@ -2950,6 +2959,7 @@ class stock_picking_in(osv.osv):
         return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
 
     _columns = {
+        'backorder_id': fields.many2one('stock.picking.in', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),
@@ -2994,6 +3004,7 @@ class stock_picking_out(osv.osv):
         return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
 
     _columns = {
+        'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 3cdfbfff410..863e51e913f 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -88,7 +88,7 @@ openerp.web_linkedin = function(instance) {
         selected_entity: function(entity) {
             var self = this;
             this.create_on_change(entity).then(function(to_change) {
-                self.view.on_processed_onchange({value:to_change});
+                self.view.set_values(to_change);
             });
         },
         create_on_change: function(entity) {