diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a6d5f6859af..85199d09c60 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1431,7 +1431,10 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             if r['class']=='private':
                 for f in r.keys():
                     if f not in ('id','date','date_deadline','duration','user_id','state'):
-                        r[f] = False
+                        if isinstance(r[f], list):
+                            r[f] = []
+                        else:    
+                            r[f] = False
                     if f=='name':
                         r[f] = _('Busy')
 
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 4ea4776ad9b..0ee23ed1d0f 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -53,7 +53,7 @@ class crm_meeting(base_state, osv.Model):
         'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id',
             string='Attendees', states={'done': [('readonly', True)]}),
         'state': fields.selection(
-                    [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
+                    [('draft', 'Unconfirmed'), ('open', 'Confirmed')],
                     string='Status', size=16, readonly=True),
         # Meeting fields
         'name': fields.char('Meeting Subject', size=128, required=True, states={'done': [('readonly', True)]}),
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 928f8d94d5c..b963de68130 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -69,9 +69,7 @@
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
-                <header>
-                    <field name="state" invisible="True"/>
-                </header>
+                <field name="state" invisible="True"/>
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 529e70fdb49..9db3ece7d8b 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -69,7 +69,7 @@ class base_stage(object):
             return False
         return uid
 
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False, context=None):
         """ This function returns value of partner email based on Partner Address
             :param add: Id of Partner's address
             :param email: Partner's email ID
@@ -77,10 +77,20 @@ class base_stage(object):
         data = {'value': {'email_from': False, 'phone':False}}
         if add:
             address = self.pool.get('res.partner').browse(cr, uid, add)
-            data['value'] = {'email_from': address and address.email or False ,
-                             'phone':  address and address.phone or False}
-        if 'phone' not in self._columns:
-            del data['value']['phone']
+            data['value'] = {'partner_name': address and address.name or False,
+                             'email_from': address and address.email or False,
+                             'phone':  address and address.phone or False,
+                             'street': address and address.street or False,
+                             'street2': address and address.street2 or False,
+                             'city': address and address.city or False,
+                             'state_id': address.state_id and address.state_id.id or False,
+                             'zip': address and address.zip or False,
+                             'country_id': address.country_id and address.country_id.id or False,
+                             }
+        fields = self.fields_get(cr, uid, context=context or {})
+        for key in data['value'].keys():
+            if key not in fields:
+                del data['value'][key]
         return data
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index aff2bcb610b..330bbb1fc9b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -92,9 +92,10 @@ class crm_case_stage(osv.osv):
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'state': 'draft',
+        'state': 'open',
         'fold': False,
         'type': 'both',
+        'case_default': True,
     }
 
 class crm_case_section(osv.osv):
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2f885e09b61..8c1e1c9ec76 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -104,56 +104,55 @@
         <field name="arch" type="xml">
             <form string="Phone Call" version="7.0">
             <header>
-                <button name="case_close" string="Held" type="object" class="oe_highlight"
+                <button name="case_close" string="Call Done" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
-                <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}"/>
-                <button string="Convert to Opportunity" class="oe_highlight"
-                        name="%(phonecall2opportunity_act)d"
-                        type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
-                <button string="Schedule Other Call"
-                        name="%(phonecall_to_phonecall_act)d"
-                        type="action"/>
-                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
             </header>
-            <sheet string="Phone Call">
-                  <div class="oe_title">
-                      <div class="oe_edit_only">
-                          <label for="name" string="Title"/>
-                      </div>
-                      <h1><field name="name" required="1"/></h1>
-                      <div class="oe_edit_only">
-                        <label for="partner_phone" string="Phone"/>
-                      </div>
-                      <h2><field name="partner_phone"/></h2>
-                  </div>
-                 <group col="4">
-                    <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="duration" widget="float_time"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile"/>
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
-                </group>
+                <sheet string="Phone Call">
+                    <div class="oe_right"> 
+                        <button string="Convert to Opportunity"
+                            name="%(phonecall2opportunity_act)d"
+                            type="action"
+                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"/>
+                        <button string="Schedule Other Call"
+                                name="%(phonecall_to_phonecall_act)d"
+                                type="action"/>
+                        <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+                    </div>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name" string="Title"/>
+                        </div>
+                        <h1><field name="name" required="1"/></h1>
+                        <div class="oe_edit_only">
+                            <label for="partner_phone" string="Phone"/>
+                        </div>
+                        <h2><field name="partner_phone"/></h2>
+                    </div>
+  
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="duration" widget="float_time"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="partner_mobile"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
 
-                <field name="description" placeholder="Description..."/>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_ids" widget="mail_thread"/>
-                <field name="message_follower_ids" widget="mail_followers"/>
-            </div>
+                    <field name="description" placeholder="Description..."/>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index a3c60d4421c..eae78de70a0 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -130,10 +130,10 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
-                        string="Schedule a Meeting"
+                        string="Meetings"
                         name="%(base_calendar.action_crm_meeting)d"
                         context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
-                    <button type="action" string="Schedule a Call" 
+                    <button type="action" string="Calls" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
diff --git a/addons/google_map/i18n/is.po b/addons/google_map/i18n/is.po
new file mode 100644
index 00000000000..0156fcb1edf
--- /dev/null
+++ b/addons/google_map/i18n/is.po
@@ -0,0 +1,33 @@
+# Icelandic 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-19 10:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
+
+#. module: google_map
+#: view:res.partner:0
+msgid "Map"
+msgstr "Landakort"
+
+#. module: google_map
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Heimilisfang viðskiptaaðila"
+
+#. module: google_map
+#: view:res.partner:0
+msgid "Street2 : "
+msgstr "Gata2 : "
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 1646fb7ff2a..5ffa44cb9c5 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -444,11 +444,9 @@ class sugar_import(import_framework):
     import Tasks
     """
     task_state = {
-            'Completed' : 'done',
+            'Completed' : 'open',
             'Not Started':'draft',
-            'In Progress': 'open',
             'Pending Input': 'draft',
-            'deferred': 'cancel'
         }
 
     def import_task(self, val):
diff --git a/addons/plugin_thunderbird/i18n/is.po b/addons/plugin_thunderbird/i18n/is.po
new file mode 100644
index 00000000000..cc846bc56d8
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/is.po
@@ -0,0 +1,109 @@
+# Icelandic 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-09 00:36+0000\n"
+"PO-Revision-Date: 2012-09-19 10:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Uppsetningarhandbók"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "Lýsing"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "titill"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr "plugin_thunderbird.installer"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Mynd"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Thunderbird viðbót"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your email to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Gerir þér kleift að velja hlut sem þú vilt bæta við póstinn og viðhengi hans."
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "Handbókin :- hvernig á að setja inn Thunderbird viðbót."
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "_Loka"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Skrárheiti"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Skrá með Thunderbird viðbót. Vistaðu skrána og settu viðbótina inn í "
+"Thunderbird."
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr "Setja inn Thunderbird viðbót"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Þessi viðbót gerir þér kleift að tengja tölvupóst við OpenERP skjöl. Þú "
+#~ "getur viðhengt póstinn við skjöl sem þegar eru til í OpenERP eða búið til "
+#~ "nýtt."
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 755da7c42ee..68e053b9e22 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -38,7 +38,6 @@ class stock_partial_picking_line(osv.TransientModel):
             res[tracklot.id] = tracking
         return res
 
-
     _name = "stock.partial.picking.line"
     _rec_name = 'product_id'
     _columns = {
@@ -56,6 +55,14 @@ class stock_partial_picking_line(osv.TransientModel):
         'tracking': fields.function(_tracking, string='Tracking', type='boolean'), 
     }
 
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
+        uom_id = False
+        if product_id:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            uom_id = product.uom_id.id
+        return {'value': {'product_uom': uom_id}}
+
+
 class stock_partial_picking(osv.osv_memory):
     _name = "stock.partial.picking"
     _description = "Partial Picking Processing Wizard"
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index fb01c93315e..98f599da48b 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -19,7 +19,7 @@
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
                         <tree editable="bottom" string="Product Moves">
-                            <field name="product_id" />
+                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
                             <field name="quantity" />
                             <field name="product_uom" groups="product.group_uom"/>
                             <field name="tracking" invisible="1"/>