diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 6e2fd083b54..c666e4dcf2e 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/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-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-06-27 14:01+0000\n"
+"PO-Revision-Date: 2013-07-02 06:32+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: 2013-06-28 05:42+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-03 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4707,7 +4707,7 @@ msgstr "Месяц"
 #: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Нальзя изменить код счета который содержит проводки!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
@@ -4826,7 +4826,7 @@ msgstr "Отметьте, если хотите выводить счета с 0
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Сверка проводок открытия"
 
 #. module: account
 #. openerp-web
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 897b8366b7a..3b000e40592 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -366,12 +366,13 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
         return period or 0.0
 
     def _get_partners(self,data):
+        # TODO: deprecated, to remove in trunk
         if data['form']['result_selection'] == 'customer':
-            return 'Receivable Accounts'
+            return self._translate('Receivable Accounts')
         elif data['form']['result_selection'] == 'supplier':
-            return 'Payable Accounts'
+            return self._translate('Payable Accounts')
         elif data['form']['result_selection'] == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return self._translate('Receivable and Payable Accounts')
         return ''
 
 report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index fb79ab0d199..5b5404e9c86 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -147,7 +147,9 @@
           <para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
+          <para style="terp_default_Centre_8">Receivable Accounts[[ data['form']['result_selection'] == 'customer' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Payable Accounts[[ data['form']['result_selection'] == 'supplier' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
@@ -166,7 +168,8 @@
           <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
+          <para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 88980a9cd97..6ddfc238bff 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -211,8 +211,10 @@
     </para>
     <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
-        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para>
+        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -233,7 +235,11 @@
         <td>
           <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
-          <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+          <td>
+          <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
+          </td>
         <td>  <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
           <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 4ad086d6bd4..dce30e59918 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -220,8 +220,8 @@
     </blockTable>
       <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+      	<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
     	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and  get_filter(data) ]]</para></td>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 7ae5db98f20..c5d24343148 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -360,9 +360,8 @@
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para>
-        </td>
+          <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -395,7 +394,9 @@
           <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+          <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 769a8335f55..97e19be4b0c 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -189,11 +189,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return data['form']['amount_currency']
 
     def _get_sortby(self, data):
+        # TODO: deprecated, to remove in trunk
         if self.sort_selection == 'date':
-            return 'Date'
+            return self._translate('Date')
         elif self.sort_selection == 'ref':
-            return 'Reference Number'
-        return 'Date'
+            return self._translate('Reference Number')
+        return self._translate('Date')
 
 report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
 report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index fb203d4e664..6d606ed1937 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -186,8 +186,8 @@
     </para>
     <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
-          <td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
-              <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+          <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
+              <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
           <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
           <td><para style="terp_tblheader_General_Centre">Journal</para></td>
           <td><para style="terp_tblheader_General_Centre">Period</para></td>
@@ -199,8 +199,10 @@
           <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
           <td><para style="terp_default_Centre_8">[[ o.journal_id.name  ]]</para></td>
           <td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td>
-          <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-          <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
+          <td>
+             <para style="terp_default_Centre_8">Date[[ data['form'].get('sort_selection', 'date') == 'date' and ' ' or removeParentNode('para') ]]</para>
+             <para style="terp_default_Centre_8">Reference Number[[ data['form'].get('sort_selection', 'date') == 'ref' and ' ' or removeParentNode('para') ]]</para>
+          </td>
       </tr>
     </blockTable>
     <para style="P9">
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 21c1ee3d846..d21323e02fc 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -267,12 +267,13 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
         return result_tmp  + result_init
 
     def _get_partners(self):
+        # TODO: deprecated, to remove in trunk
         if self.result_selection == 'customer':
-            return 'Receivable Accounts'
+            return _('Receivable Accounts')
         elif self.result_selection == 'supplier':
-            return 'Payable Accounts'
+            return _('Payable Accounts')
         elif self.result_selection == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return _('Receivable and Payable Accounts')
         return ''
 
     def _sum_currency_amount_account(self, account, form):
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 0d7122369c6..48ed6d4afe3 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -423,7 +423,9 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
+          <para style="terp_default_Centre_8">Receivable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'supplier' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer_supplier' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 997b2b03bb6..0b904e19da6 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -84,7 +84,7 @@ openerp.account.quickadd = function (instance) {
         },
         search_by_journal_period: function() {
             var self = this;
-            var domain = [];
+            var domain = ['|',['debit', '!=', 0], ['credit', '!=', 0]];
             if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
             if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
             self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index c457140684a..871aea9e4d9 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -175,7 +175,7 @@ class account_common_report(osv.osv_memory):
                 data['form'][field] = data['form'][field][0]
         used_context = self._build_contexts(cr, uid, ids, data, context=context)
         data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
-        data['form']['used_context'] = used_context
+        data['form']['used_context'] = dict(used_context, lang=context.get('lang', 'en_US'))
         return self._print_report(cr, uid, ids, data, context=context)
 
 
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 7fb4091b45f..42b17ae06c3 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -248,9 +248,12 @@
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
-                <field name="analytic_id" required="1" position="replace">
+                <xpath  expr="//field[@name='analytic_id']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath  expr="//field[@name='analytic_id']" position="after">
                     <field name="analytics_id" required="1"/>
-                </field>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 8c61af1f03c..e42dc64151f 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -42,7 +42,7 @@ class Controller(http.Controller):
             }
         return config
 
-    @http.route('/auth_signup/retrieve', type='json', auth="user")
+    @http.route('/auth_signup/retrieve', type='json', auth="none")
     def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
@@ -51,7 +51,7 @@ class Controller(http.Controller):
             user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @http.route('/auth_signup/signup', type='json', auth="user")
+    @http.route('/auth_signup/signup', type='json', auth="none")
     def signup(self, dbname, token, **values):
         """ sign up a user (new or existing)"""
         try:
@@ -66,7 +66,7 @@ class Controller(http.Controller):
             res_users = registry.get('res.users')
             res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
-    @http.route('/auth_signup/reset_password', type='json', auth="user")
+    @http.route('/auth_signup/reset_password', type='json', auth="none")
     def reset_password(self, dbname, login):
         """ retrieve user, and perform reset password """
         registry = RegistryManager.get(dbname)
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index aa8d9f952c1..497b872997f 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-16 04:33+0000\n"
-"Last-Translator: Key <key.diagram@gmail.com>\n"
+"PO-Revision-Date: 2013-07-02 08:11+0000\n"
+"Last-Translator: DWXXX <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2013-04-17 05:15+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-07-03 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -29,7 +29,7 @@ msgstr "允许外部用户登录"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
 #, python-format
 msgid "Confirm Password"
 msgstr "确认密码"
@@ -37,7 +37,7 @@ msgstr "确认密码"
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
-msgstr ""
+msgstr "如果不勾选，只有被邀请用户才能注册。"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
@@ -45,15 +45,15 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:265
+#: code:addons/auth_signup/res_users.py:266
 #, python-format
 msgid "Cannot send email: user has no email address."
-msgstr ""
+msgstr "无法发送邮件：用户邮件地址为空。"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
 #, python-format
 msgid "Reset password"
 msgstr "重设密码"
@@ -70,7 +70,7 @@ msgstr "重置密码"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "请输入密码并确认。"
@@ -78,12 +78,12 @@ msgstr "请输入密码并确认。"
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send an email to the user to (re)set their password."
-msgstr ""
+msgstr "向用户发送重置密码邮件。"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
 #, python-format
 msgid "Sign Up"
 msgstr "注册"
@@ -119,10 +119,10 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "请输入名字"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -136,10 +136,10 @@ msgstr "注册 URL"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #, python-format
 msgid "Please enter a username."
-msgstr ""
+msgstr "请输入您的用户名"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -147,7 +147,7 @@ msgid "Active"
 msgstr "启用"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:269
+#: code:addons/auth_signup/res_users.py:270
 #, python-format
 msgid ""
 "Cannot send email: no outgoing email server configured.\n"
@@ -170,10 +170,10 @@ msgstr "姓名"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "请输入用户名和邮件地址"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -199,7 +199,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
 #, python-format
 msgid "Log in"
 msgstr "登录"
@@ -211,35 +211,35 @@ msgstr "注册令牌（ Token  ）是有效的"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:108
 #: code:addons/auth_signup/static/src/js/auth_signup.js:111
 #: code:addons/auth_signup/static/src/js/auth_signup.js:114
 #: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:108
-#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "No database selected !"
 msgstr ""
@@ -256,7 +256,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
 #, python-format
 msgid "Back to Login"
 msgstr "返回登录页面"
@@ -266,12 +266,12 @@ msgstr "返回登录页面"
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Sign up"
-msgstr ""
+msgstr "注册"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr "业务伙伴"
+msgstr "合作伙伴"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 896349ec5e6..a9061c0afce 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1510,7 +1510,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                     continue
             if r['class']=='private':
                 for f in r.keys():
-                    if f not in ('id','date','date_deadline','duration','user_id','state'):
+                    if f not in ('id','date','date_deadline','duration','user_id','state','interval','count'):
                         if isinstance(r[f], list):
                             r[f] = []
                         else:
diff --git a/addons/base_status/i18n/sv.po b/addons/base_status/i18n/sv.po
new file mode 100644
index 00000000000..eb1b42e6a53
--- /dev/null
+++ b/addons/base_status/i18n/sv.po
@@ -0,0 +1,79 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-07-08 15:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2013-07-09 05:16+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Fel !"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:166
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr "%s har <b>öppnats</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:199
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr "%s har <b>förnyats</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"Du kan inte eskalera längre, du har nått toppen för denna säljlags-kategori."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:193
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr "%s är nu <b>pågående</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr "%s har <b>avbrutits</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"Du har nått översta nivån för din säljlagskategori.\n"
+"Det går därför inte att eskalera ytterligare."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:181
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr "%s har <b>stängts</b>."
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 1070af22b3c..af02e3be1bf 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
 from operator import itemgetter
@@ -68,7 +67,7 @@ CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_lead(base_stage, format_address, osv.osv):
+class crm_lead(format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
@@ -93,20 +92,6 @@ class crm_lead(base_stage, format_address, osv.osv):
         context['empty_list_help_document_name'] = _("leads")
         return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context)
 
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('section_id'):
-                ctx['default_section_id'] = vals['section_id']
-            if vals.get('type'):
-                ctx['default_type'] = vals['type']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
-        # context: no_log, because subtype already handle this
-        create_context = dict(context, mail_create_nolog=True)
-        return super(crm_lead, self).create(cr, uid, vals, context=create_context)
-
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
         return self._resolve_section_id_from_context(cr, uid, context=context) or False
@@ -126,8 +111,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         if type(context.get('default_section_id')) in (int, long):
             return context.get('default_section_id')
         if isinstance(context.get('default_section_id'), basestring):
-            section_name = context['default_section_id']
-            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=section_name, context=context)
+            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=context['default_section_id'], context=context)
             if len(section_ids) == 1:
                 return int(section_ids[0][0])
         return None
@@ -326,8 +310,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     _defaults = {
         'active': 1,
         'type': 'lead',
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
@@ -341,30 +324,29 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
         if not stage_id:
-            return {'value':{}}
+            return {'value': {}}
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
         if not stage.on_change:
-            return {'value':{}}
-        return {'value':{'probability': stage.probability}}
+            return {'value': {}}
+        return {'value': {'probability': stage.probability}}
 
-    def on_change_partner(self, cr, uid, ids, partner_id, context=None):
-        result = {}
+    def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):
         values = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name' : partner.name,
-                'street' : partner.street,
-                'street2' : partner.street2,
-                'city' : partner.city,
-                'state_id' : partner.state_id and partner.state_id.id or False,
-                'country_id' : partner.country_id and partner.country_id.id or False,
-                'email_from' : partner.email,
-                'phone' : partner.phone,
-                'mobile' : partner.mobile,
-                'fax' : partner.fax,
+                'partner_name': partner.name,
+                'street': partner.street,
+                'street2': partner.street2,
+                'city': partner.city,
+                'state_id': partner.state_id and partner.state_id.id or False,
+                'country_id': partner.country_id and partner.country_id.id or False,
+                'email_from': partner.email,
+                'phone': partner.phone,
+                'mobile': partner.mobile,
+                'fax': partner.fax,
             }
-        return {'value' : values}
+        return {'value': values}
 
     def on_change_user(self, cr, uid, ids, user_id, context=None):
         """ When changing the user, also set a section_id or restrict section id
@@ -405,7 +387,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         # collect all section_ids
         section_ids = []
         types = ['both']
-        if not cases :
+        if not cases:
             type = context.get('default_type')
             types += [type]
         if section_id:
@@ -433,24 +415,18 @@ class crm_lead(base_stage, format_address, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Overrides case_cancel from base_stage to set probability """
-        res = super(crm_lead, self).case_cancel(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability' : 0.0}, context=context)
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """ Overrides case_reset from base_stage to set probability """
-        res = super(crm_lead, self).case_reset(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability': 0.0}, context=context)
-        return res
+    def stage_set(self, cr, uid, ids, stage_id, context=None):
+        """ Set the new stage. Now just writes the stage.
+            TDE TODO: remove me when removing state
+        """
+        return self.write(cr, uid, ids, {'stage_id': stage_id}, context=context)
 
     def case_mark_lost(self, cr, uid, ids, context=None):
         """ Mark the case as lost: state=cancel and probability=0 """
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0),('on_change','=',True)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 0.0}, new_stage_id=stage_id, context=context)
+                self.stage_set(cr, uid, [lead.id], stage_id, context=context)
         return True
 
     def case_mark_won(self, cr, uid, ids, context=None):
@@ -458,7 +434,21 @@ class crm_lead(base_stage, format_address, osv.osv):
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0),('on_change','=',True)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 100.0}, new_stage_id=stage_id, context=context)
+                self.stage_set(cr, uid, [lead.id], stage_id, context=context)
+        return True
+
+    def case_escalate(self, cr, uid, ids, context=None):
+        """ Escalates case to parent level """
+        for case in self.browse(cr, uid, ids, context=context):
+            data = {'active': True}
+            if case.section_id.parent_id:
+                data['section_id'] = case.section_id.parent_id.id
+                if case.section_id.parent_id.change_responsible:
+                    if case.section_id.parent_id.user_id:
+                        data['user_id'] = case.section_id.parent_id.user_id.id
+            else:
+                raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
+            self.write(cr, uid, [case.id], data, context=context)
         return True
 
     def set_priority(self, cr, uid, ids, priority):
@@ -932,12 +922,22 @@ class crm_lead(base_stage, format_address, osv.osv):
         }
         return res
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('type') and not context.get('default_type'):
+            context['default_type'] = vals.get('type')
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
+        # context: no_log, because subtype already handle this
+        create_context = dict(context, mail_create_nolog=True)
+        return super(crm_lead, self).create(cr, uid, vals, context=create_context)
+
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('stage_id') and not vals.get('probability'):
-            # change probability of lead(s) if required by stage
-            stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
-            if stage.on_change:
-                vals['probability'] = stage.probability
+            onchange_stage_values = self.onchange_stage_id(cr, uid, ids, vals.get('stage_id'), context=context)['value']
+            vals.update(onchange_stage_values)
         return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
 
     def new_mail_send(self, cr, uid, ids, context=None):
@@ -1024,7 +1024,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             'user_id': False,
         }
         if msg.get('author_id'):
-            defaults.update(self.on_change_partner(cr, uid, None, msg.get('author_id'), context=context)['value'])
+            defaults.update(self.on_change_partner_id(cr, uid, None, msg.get('author_id'), context=context)['value'])
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             defaults['priority'] = msg.get('priority')
         defaults.update(custom_values)
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 4c6cf47c4f7..3917fadbd32 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -263,13 +263,6 @@ Andrew</field>
             <field eval="1" name="active"/>
         </record>
 
-        <!-- Call Function to Cancel the leads (set as Dead) -->
-        <function model="crm.lead" name="case_cancel"
-            eval="[ ref('crm_case_12'), ref('crm_case_7'),
-                    ref('crm_case_3'), ref('crm_case_8')],
-                  {'install_mode': True}"
-        />
-
         <!-- Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_1'), ref('crm_case_2'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index df6a4a07a8e..cb4302166a1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -95,10 +95,6 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_reset" string="Reset" type="object"
-                            states="cancel"/>
-                    <button name="case_cancel" string="Cancel Case" type="object"
-                            states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
                             domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
                             on_change="onchange_stage_id(stage_id)"/>
@@ -118,7 +114,7 @@
                             <field name="partner_name" string="Company Name"/>
                             <!-- Preload all the partner's information -->
                             <field name="partner_id" string="Customer"
-                                on_change="on_change_partner(partner_id)"
+                                on_change="on_change_partner_id(partner_id)"
                                 options='{"create_name_field": "name"}'
                                 context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_section_id': section_id}"/>
                             <label for="street" string="Address"/>
@@ -617,7 +613,7 @@
             <field name="state">code</field>
             <field name="code">
                 if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
-                    self.case_cancel(cr, uid, context['active_ids'], context=context)
+                    self.case_mark_lost(cr, uid, context['active_ids'], context=context)
             </field>
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 2344604a294..f6f94547173 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -58,7 +58,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context">{}</field>
+        <field name="context">{'default_state': 'done'}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
diff --git a/addons/crm/doc/changelog.rst b/addons/crm/doc/changelog.rst
new file mode 100644
index 00000000000..cb1602a8d39
--- /dev/null
+++ b/addons/crm/doc/changelog.rst
@@ -0,0 +1,11 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- ``crm``, ``crm_claim``: removed inheritance from ``base_stage`` class. Missing
+  methods have been added into ``crm`` and ``crm_claim``. Also removed inheritance
+  in ``crm_helpdesk`` because it uses states, not stages.
\ No newline at end of file
diff --git a/addons/crm/doc/index.rst b/addons/crm/doc/index.rst
new file mode 100644
index 00000000000..d70e045befe
--- /dev/null
+++ b/addons/crm/doc/index.rst
@@ -0,0 +1,13 @@
+CRM module documentation
+========================
+
+CRM documentation topics
+'''''''''''''''''''''''''
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index f25b1303c02..fca9222082d 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -56,7 +56,7 @@ class res_partner(osv.osv):
 
         default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
 
-        super(res_partner, self).copy(cr, uid, record_id, default, context)
+        return super(res_partner, self).copy(cr, uid, record_id, default, context)
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
         search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index 8749675bf23..0f8d9ba1df9 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -4,37 +4,6 @@
   !python {model: crm.lead}: |
     section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
     self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
-    self.case_cancel(cr, uid, [ref("crm_case_1")])
--
-  I check cancelled lead.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead7'), "Stage should be 'Dead' and is %s." % (lead.stage_id.name)
-    assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
-    assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
--
-  I reset cancelled lead into unqualified lead.
--
-  !python {model: crm.lead}: |
-    self.case_reset(cr, uid, [ref("crm_case_1")])
--
-  I check unqualified lead after reset.
--
-  !assert {model: crm.lead, id: crm.crm_case_1, string: Lead is in draft state}:
-    - state == "draft"
--
-  I re-open the lead
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_case_1")])
--
- I check stage and state of the re-opened lead
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm.crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead2'), "Opportunity stage should be 'Qualification'."
-    assert lead.state == 'open', "Opportunity should be in 'open' state."
 -
   I escalate the lead to parent team.
 -
diff --git a/addons/crm/test/crm_lead_onchange.yml b/addons/crm/test/crm_lead_onchange.yml
index 9154ffdf513..45e140e890e 100644
--- a/addons/crm/test/crm_lead_onchange.yml
+++ b/addons/crm/test/crm_lead_onchange.yml
@@ -20,9 +20,4 @@
 -
   !record {model: crm.phonecall, id: crm_phonecall_5}:
     name: 'Bad time'
-    partner_id: base.res_partner_5
--
-  I set the next stage to "New" for the lead.
--
-  !python {model: crm.lead}: |
-    self.stage_next(cr, uid, [ref("crm_case_4")], context={'stage_type': 'lead'})
+    partner_id: base.res_partner_5
\ No newline at end of file
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index 94e7149ef77..23545c61bc1 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -1,25 +1,15 @@
 -
   In order to test the conversion of a lead into a opportunity,
--
-  I open a lead.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_case_4")])
--
-  I check if the lead state is "Open".
--
-  !assert {model: crm.lead, id: crm.crm_case_4, string: Lead state is Open}:
-     - state == "open"
 -
   I convert lead into opportunity for exiting customer.
 -
   !python {model: crm.lead}: |
-    self.convert_opportunity(cr, uid ,[ref("crm_case_4")], ref("base.res_partner_2"))
+    self.convert_opportunity(cr, uid ,[ref("crm_case_1")], ref("base.res_partner_2"))
 -
   I check details of converted opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_4'))
+    lead = self.browse(cr, uid, ref('crm_case_1'))
     assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
     assert lead.partner_id.id == ref("base.res_partner_2"), 'Partner mismatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
@@ -28,7 +18,7 @@
 -
   !python {model: crm.opportunity2phonecall}: |
     import time
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_4')]})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_1')]})
     call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'name': "Bonjour M. Jean, Comment allez-vous? J'ai bien reçu votre demande, pourrions-nous en parler quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
@@ -36,28 +26,28 @@
   I check that phonecall is scheduled for that opportunity.
 -
   !python {model: crm.phonecall}: |
-    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_4'))])
+    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_1'))])
     assert len(ids), 'Phonecall is not scheduled'
 -
   Now I schedule meeting with customer.
 -
   !python {model: crm.lead}: |
-    self.action_makeMeeting(cr, uid, [ref('crm_case_4')])
+    self.action_makeMeeting(cr, uid, [ref('crm_case_1')])
 -
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_1')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
   !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_case_4")])
+    self.case_mark_won(cr, uid, [ref("crm_case_1")])
 -
   I check details of the opportunity after having won the opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_4'))
+    lead = self.browse(cr, uid, ref('crm_case_1'))
     assert lead.stage_id.id == ref('crm.stage_lead6'), "Opportunity stage should be 'Won'."
     assert lead.state == 'done', "Opportunity is not in 'done' state!"
     assert lead.probability == 100.0, "Revenue probability should be 100.0!"
@@ -104,7 +94,6 @@
 -
   !python {model: crm.meeting}: |
     context.update({'active_model': 'crm.meeting'})
-    self.case_open(cr, uid, [ref('base_calendar.crm_meeting_4')])
 -
   I invite a user for meeting.
 -
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 774571b0314..1e3ed2faad1 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -19,20 +19,12 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_stage import base_stage
-import binascii
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
-import time
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_CLAIM_PENDING_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
 class crm_claim_stage(osv.osv):
     """ Model for claim stages. This models the main stages of a claim
@@ -51,8 +43,6 @@ class crm_claim_stage(osv.osv):
         'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
         'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."),
-        'case_refused': fields.boolean('Refused stage',
-                        help='Refused stages are specific stages for done.'),
         'case_default': fields.boolean('Common to All Teams',
                         help="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."),
         'fold': fields.boolean('Hide in Views when Empty',
@@ -63,10 +53,9 @@ class crm_claim_stage(osv.osv):
         'sequence': lambda *args: 1,
         'state': 'draft',
         'fold': False,
-        'case_refused': False,
     }
 
-class crm_claim(base_stage, osv.osv):
+class crm_claim(osv.osv):
     """ Crm claim
     """
     _name = "crm.claim"
@@ -74,6 +63,15 @@ class crm_claim(base_stage, osv.osv):
     _order = "priority,date desc"
     _inherit = ['mail.thread']
 
+    def _get_default_section_id(self, cr, uid, context=None):
+        """ Gives default section by checking if present in the context """
+        return self.pool.get('crm.lead')._resolve_section_id_from_context(cr, uid, context=context) or False
+
+    def _get_default_stage_id(self, cr, uid, context=None):
+        """ Gives default stage_id """
+        section_id = self._get_default_section_id(cr, uid, context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft')], context=context)
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
@@ -117,15 +115,13 @@ class crm_claim(base_stage, osv.osv):
     }
 
     _defaults = {
-        'user_id':  lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'partner_id':  lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
-        'date': fields.datetime.now,
+        'date': fields.datetime.now(),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
         'active': lambda *a: 1,
-        'stage_id':lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
+        'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
     }
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
@@ -158,27 +154,24 @@ class crm_claim(base_stage, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_refuse(self, cr, uid, ids, context=None):
-        """ Mark the case as refused: state=done and case_refused=True """
-        for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, ['&', ('state', '=', 'done'), ('case_refused', '=', True)], context=context)
-            if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={}, new_stage_id=stage_id, context=context)
-        return True
-
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, email=False, context=None):
         """This function returns value of partner address based on partner
-           :param part: Partner's id
            :param email: ignored
         """
-        if not part:
-            return {'value': {'email_from': False,
-                              'partner_phone': False
-                            }
-                   }
-        address = self.pool.get('res.partner').browse(cr, uid, part)
+        if not partner_id:
+            return {'value': {'email_from': False, 'partner_phone': False}}
+        address = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
+        # context: no_log, because subtype already handle this
+        return super(crm_claim, self).create(cr, uid, vals, context=context)
+
     # -------------------------------------------------------
     # Mail gateway
     # -------------------------------------------------------
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index da0acd8a2a5..dde2f44aa85 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -52,7 +52,6 @@
                     <field name="case_default"/>
                     <field name="sequence"/>
                     <field name="state"/>
-                    <field name="case_refused"/>
                     <field name="fold"/>
                 </form>
             </field>
@@ -102,10 +101,6 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
-                            states="draft,open,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Reject" type="object" groups="base.group_user"
-                            states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index a843372956e..f6c6f6d315c 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -21,25 +21,9 @@
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    self.case_open(cr, uid, claim_ids)
 -
-  I check Claim Details after open. 
+  I check Claim Details after open.
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "open", "Claim is not in Open state"
-    assert claim.stage_id.id == ref("crm.stage_lead2"), "Claim is not in Qualification stage"
--
-  After complete all service from our side, I close this claim.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    self.case_close(cr, uid, claim_ids)
--
-  I check Claim details after closed.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "done", "Claim is not in close state"
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 2d0383962b1..ea58016b4c1 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -20,20 +20,14 @@
 ##############################################################################
 
 from openerp.addons.base_status.base_state import base_state
-from openerp.addons.base_status.base_stage import base_stage
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_HELPDESK_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
-class crm_helpdesk(base_state, base_stage, osv.osv):
+class crm_helpdesk(base_state, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
@@ -80,9 +74,7 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'state': lambda *a: 'draft',
         'date': lambda *a: fields.datetime.now(),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index f74cfe02a21..7f885018001 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -66,7 +66,7 @@ class document_page(osv.osv):
         'create_date': fields.datetime("Created on", select=True, readonly=True),
         'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
         'write_date': fields.datetime("Modification Date", select=True, readonly=True),
-        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
+        'write_uid': fields.many2one('res.users', "Last Contributor", select=True, readonly=True),
     }
     _defaults = {
         'type':'content',
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2e678fa2060..ff3aeab51fd 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,7 +86,7 @@
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account')}">
+                            <field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account', '')}">
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index d8c00c40a31..2bfe03fe5fa 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -240,7 +240,7 @@ class hr_applicant(base_stage, osv.Model):
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id':  lambda s, cr, uid, c: uid,
+        'user_id': lambda s, cr, uid, c: uid,
         'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
@@ -253,13 +253,11 @@ class hr_applicant(base_stage, osv.Model):
     }
 
     def onchange_job(self, cr, uid, ids, job, context=None):
-        result = {}
-
         if job:
-            job_obj = self.pool.get('hr.job')
-            result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
-            return {'value': result}
-        return {'value': {'department_id': False}}
+            job_record = self.pool.get('hr.job').browse(cr, uid, job, context=context)
+            if job_record and job_record.department_id:
+                return {'value': {'department_id': job_record.department_id.id}}
+        return {}
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
         obj_recru_stage = self.pool.get('hr.recruitment.stage')
@@ -403,6 +401,11 @@ class hr_applicant(base_stage, osv.Model):
         return super(hr_applicant, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('department_id') and not context.get('default_department_id'):
+            context['default_department_id'] = vals.get('department_id')
+
         obj_id = super(hr_applicant, self).create(cr, uid, vals, context=context)
         applicant = self.browse(cr, uid, obj_id, context=context)
         if applicant.job_id:
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 67d2ae0219f..c4f9506a3bb 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -187,6 +187,7 @@
                 <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <field name="job_id"/>
+                <field name="department_id"/>
                 <field name="user_id"/>
                 <separator/>
                 <field name="categ_ids"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 6c4f6022c39..b950b85ac48 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -173,7 +173,10 @@ class account_analytic_line(osv.osv):
             data = {}
 
         journal_types = {}
+        price = 0.0
         for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
+            price += line.amount*-1
+            line_name = line.name
             if line.journal_id.type not in journal_types:
                 journal_types[line.journal_id.type] = set()
             journal_types[line.journal_id.type].add(line.account_id.id)
@@ -204,7 +207,6 @@ class account_analytic_line(osv.osv):
                     'date_due': date_due,
                     'fiscal_position': account.partner_id.property_account_position.id
                 }
-
                 context2 = context.copy()
                 context2['lang'] = partner.lang
                 # set company_id in context, so the correct default journal will be selected
@@ -225,36 +227,42 @@ class account_analytic_line(osv.osv):
                     if data.get('product'):
                         product_id = data['product'][0]
                     product = product_obj.browse(cr, uid, product_id, context=context2)
-                    if not product:
-                        raise osv.except_osv(_('Error!'), _('There is no product defined. Please select one or force the product through the wizard.'))
                     factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
-                    factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
-                    if factor.customer_name:
-                        factor_name += ' - ' + factor.customer_name
-
-                    ctx =  context.copy()
-                    ctx.update({'uom':uom})
-
-                    price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
-
-                    general_account = product.property_account_income or product.categ_id.property_account_income_categ
-                    if not general_account:
-                        raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
-                    taxes = product.taxes_id or general_account.tax_ids
-                    tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                    factor_name = factor.customer_name and line_name + ' - ' + factor.customer_name or line_name
                     curr_line = {
                         'price_unit': price,
                         'quantity': qty,
-                        'discount':factor.factor,
-                        'invoice_line_tax_id': [(6,0,tax )],
+                        'discount': factor.factor,
                         'invoice_id': last_invoice,
                         'name': factor_name,
-                        'product_id': product_id,
-                        'invoice_line_tax_id': [(6,0,tax)],
                         'uos_id': uom,
-                        'account_id': general_account.id,
                         'account_analytic_id': account.id,
                     }
+                    if product:
+                        factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
+                        if factor.customer_name:
+                            factor_name += ' - ' + factor.customer_name
+
+                        ctx = context.copy()
+                        ctx.update({'uom': uom})
+
+                        # check force product
+                        if data.get('product'):
+                            price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
+
+                        general_account = product.property_account_income or product.categ_id.property_account_income_categ
+                        if not general_account:
+                            raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
+                        taxes = product.taxes_id or general_account.tax_ids
+                        tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                        curr_line.update({
+                            'price_unit': price,
+                            'invoice_line_tax_id': [(6,0,tax )],
+                            'name': factor_name,
+                            'product_id': product_id,
+                            'invoice_line_tax_id': [(6,0,tax)],
+                            'account_id': general_account.id,
+                        })
 
                     #
                     # Compute for lines
diff --git a/addons/idea/views/idea.xml b/addons/idea/views/idea.xml
index b228af2da45..7df21f99f11 100644
--- a/addons/idea/views/idea.xml
+++ b/addons/idea/views/idea.xml
@@ -93,7 +93,6 @@
                             help="Accepted Ideas" />
                     <group expand="0" string="Group By...">
                         <filter string="Creator" help="By Responsible" context="{'group_by': 'user_id'}"/>
-                        <filter string="Category" help="By Category" context="{'group_by': 'category_ids'}"/>
                         <filter string="Status" help="By State" context="{'group_by': 'state'}"/>
                     </group>
                 </search>
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index 8aabe601bc8..aed99345fba 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -117,6 +117,8 @@ class account_coda_import(osv.osv_memory):
                     # and so a 'like' operator would return the first account number in the database which matches.
                     cr.execute("select id from res_partner_bank where replace(replace(acc_number,' ',''),'-','') = %s", (statement['acc_number'],))
                 bank_ids = [id[0] for id in cr.fetchall()]
+                # Filter bank accounts which are not allowed
+                bank_ids = self.pool.get('res.partner.bank').search(cr, uid, [('id', 'in', bank_ids)])
                 if bank_ids and len(bank_ids) > 0:
                     bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, bank_ids)
                     for bank_acc in bank_accs:
@@ -248,7 +250,7 @@ class account_coda_import(osv.osv_memory):
             elif line[0] == '9':
                 statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000
                 statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000
-                if not statement['balance_end_real']:
+                if not statement.get('balance_end_real'):
                     statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin']
         for i, statement in enumerate(statements):
             statement['coda_note'] = ''
@@ -266,6 +268,8 @@ class account_coda_import(osv.osv_memory):
                     raise osv.except_osv(_('Error'), _("Configuration Error in journal %s!\nPlease verify the Default Debit and Credit Account settings.") % statement['journal_id'].name)
             if balance_start_check != statement['balance_start']:
                 statement['coda_note'] = _("The CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!") % (statement['description'] + ' #' + statement['paperSeqNumber'], statement['balance_start'], balance_start_check, statement['journal_id'].name)
+            if not(statement.get('period_id')):
+                raise osv.except_osv(_('Error') + ' R3006', _(' No transactions or no period in coda file !'))
             data = {
                 'name': statement['paperSeqNumber'],
                 'date': statement['date'],
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index a23dabd7c51..fca743928bf 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -153,25 +153,33 @@ class account_invoice(osv.osv):
         return {'value': {'reference': reference}}
 
     def create(self, cr, uid, vals, context=None):
-        if vals.has_key('reference_type'):
-            reference_type = vals['reference_type']
+        reference = vals.get('reference', False)
+        reference_type = vals.get('reference_type', False)
+        if vals.get('type') == 'out_invoice' and not reference_type:
+            # fallback on default communication type for partner
+            reference_type = self.pool.get('res.partner').browse(cr, uid, vals['partner_id']).out_inv_comm_type
             if reference_type == 'bba':
-                if vals.has_key('reference'):
-                    bbacomm = vals['reference']
-                else:
+                reference = self.generate_bbacomm(cr, uid, [], vals['type'], reference_type, vals['partner_id'], '', context={})['value']['reference']
+            vals.update({
+                'reference_type': reference_type or 'none',
+                'reference': reference,
+            })
+
+        if reference_type == 'bba':
+            if not reference:
+                raise osv.except_osv(_('Warning!'),
+                    _('Empty BBA Structured Communication!' \
+                      '\nPlease fill in a unique BBA Structured Communication.'))
+            if self.check_bbacomm(reference):
+                reference = re.sub('\D', '', reference)
+                vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
+                same_ids = self.search(cr, uid,
+                    [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
+                     ('reference', '=', vals['reference'])])
+                if same_ids:
                     raise osv.except_osv(_('Warning!'),
-                        _('Empty BBA Structured Communication!' \
-                          '\nPlease fill in a unique BBA Structured Communication.'))
-                if self.check_bbacomm(bbacomm):
-                    reference = re.sub('\D', '', bbacomm)
-                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
-                    same_ids = self.search(cr, uid,
-                        [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
-                         ('reference', '=', vals['reference'])])
-                    if same_ids:
-                        raise osv.except_osv(_('Warning!'),
-                            _('The BBA Structured Communication has already been used!' \
-                              '\nPlease create manually a unique BBA Structured Communication.'))
+                        _('The BBA Structured Communication has already been used!' \
+                          '\nPlease create manually a unique BBA Structured Communication.'))
         return super(account_invoice, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index afe505f27f5..f0d2670d077 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -101,8 +101,8 @@
 
     <record id="gsttvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + TVQ for sales</field>
-        <field name="description">GSTTVQ_SALE</field>
+        <field name="name">GST + QST for sales</field>
+        <field name="description">GSTQST_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
@@ -127,8 +127,8 @@
 
     <record id="tvq_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVQ for sales - 9.975%</field>
-        <field name="description">TVQ</field>
+        <field name="name">QST for sales - 9.975%</field>
+        <field name="description">QST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.099750</field>
         <field name="type">percent</field>
@@ -192,8 +192,8 @@
 
     <record id="hst12_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 12%</field>
-        <field name="description">TVH12_SALE</field>
+        <field name="name">HST for sales - 12%</field>
+        <field name="description">HST12_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
@@ -207,8 +207,8 @@
 
     <record id="hst13_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 13%</field>
-        <field name="description">TVH13_SALE</field>
+        <field name="name">HST for sales - 13%</field>
+        <field name="description">HST13_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
@@ -222,8 +222,8 @@
 
     <record id="hst135_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 13.5%</field>
-        <field name="description">TVH135_SALE</field>
+        <field name="name">HST for sales - 13.5%</field>
+        <field name="description">HST135_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
@@ -237,8 +237,8 @@
 
     <record id="hst15_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 15%</field>
-        <field name="description">TVH15_SALE</field>
+        <field name="name">HST for sales - 15%</field>
+        <field name="description">HST15_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
@@ -367,8 +367,8 @@
 
     <record id="gsttvq_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + TVQ for purchases</field>
-        <field name="description">GSTTVQ_PURC</field>
+        <field name="name">GST + QST for purchases</field>
+        <field name="description">GSTQST_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
@@ -393,8 +393,8 @@
 
     <record id="tvq_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVQ for purchases - 9.975%</field>
-        <field name="description">TVQ</field>
+        <field name="name">QST for purchases - 9.975%</field>
+        <field name="description">QST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.099750</field>
         <field name="type">percent</field>
@@ -458,8 +458,8 @@
 
     <record id="hst12_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 12%</field>
-        <field name="description">TVH12_PURC</field>
+        <field name="name">HST for purchases - 12%</field>
+        <field name="description">HST12_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.120000</field>
         <field name="type">percent</field>
@@ -473,8 +473,8 @@
 
     <record id="hst13_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 13%</field>
-        <field name="description">TVH13_PURC</field>
+        <field name="name">HST for purchases - 13%</field>
+        <field name="description">HST13_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
@@ -488,8 +488,8 @@
 
     <record id="hst135_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 13.5%</field>
-        <field name="description">TVH135_PURC</field>
+        <field name="name">HST for purchases - 13.5%</field>
+        <field name="description">HST135_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.135000</field>
         <field name="type">percent</field>
@@ -503,8 +503,8 @@
 
     <record id="hst15_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 15%</field>
-        <field name="description">TVH15_PURC</field>
+        <field name="name">HST for purchases - 15%</field>
+        <field name="description">HST15_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 8960224891d..a7830784340 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -24,8 +24,8 @@
 
 {'name': 'Switzerland - Accounting',
  'description':  """
- Swiss localization :
- ====================
+Swiss localization
+==================
  **Multilang swiss STERCHI account chart and taxes**
   **Author:** Camptocamp SA
 
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index d9e00353d49..d45ae04ddd1 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -176,7 +176,7 @@ class mail_mail(osv.Model):
         if context is None:
             context = {}
         if not ids:
-            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
+            filters = [('state', '=', 'outgoing')]
             if 'filters' in context:
                 filters.extend(context['filters'])
             ids = self.search(cr, uid, filters, context=context)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1b5d520cd42..2744e6df231 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -312,7 +312,12 @@ class mail_thread(osv.AbstractModel):
         # subscribe uid unless asked not to
         if not context.get('mail_create_nosubscribe'):
             self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
-        self.message_auto_subscribe(cr, uid, [thread_id], values.keys(), context=context)
+        # auto_subscribe: take values and defaults into account
+        create_values = set(values.keys())
+        for key, val in context.iteritems():
+            if key.startswith('default_'):
+                create_values.add(key[8:])
+        self.message_auto_subscribe(cr, uid, [thread_id], list(create_values), context=context)
 
         # track values
         tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
@@ -1436,7 +1441,7 @@ class mail_thread(osv.AbstractModel):
                                                     ], context=context)
                 mail_followers_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
             # subtype_ids not specified: do not update already subscribed partner, fetch default subtypes for new partners
-            else:
+            elif subtype_ids is None:
                 subtype_ids = subtype_obj.search(cr, uid, [
                                                         ('default', '=', True),
                                                         '|',
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 370aa2e55ff..126b4b40a07 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -975,11 +975,11 @@ class pos_order(osv.osv):
                 })
 
                 if data_type == 'product':
-                    key = ('product', values['partner_id'], values['product_id'])
+                    key = ('product', values['partner_id'], values['product_id'], values['debit'] > 0)
                 elif data_type == 'tax':
-                    key = ('tax', values['partner_id'], values['tax_code_id'],)
+                    key = ('tax', values['partner_id'], values['tax_code_id'], values['debit'] > 0)
                 elif data_type == 'counter_part':
-                    key = ('counter_part', values['partner_id'], values['account_id'])
+                    key = ('counter_part', values['partner_id'], values['account_id'], values['debit'] > 0)
                 else:
                     return
 
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index 39e7c564831..3d6e314d033 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -85,6 +85,7 @@ class pos_session_opening(osv.osv_memory):
         session_ids = proxy.search(cr, uid, [
             ('state', '!=', 'closed'),
             ('config_id', '=', config_id),
+            ('user_id', '=', uid),
         ], context=context)
         if session_ids:
             session = proxy.browse(cr, uid, session_ids[0], context=context)
diff --git a/addons/portal_anonymous/i18n/zh_CN.po b/addons/portal_anonymous/i18n/zh_CN.po
new file mode 100644
index 00000000000..53ca3f03a6a
--- /dev/null
+++ b/addons/portal_anonymous/i18n/zh_CN.po
@@ -0,0 +1,25 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-07-03 15:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2013-07-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "用户名"
diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml
index 6a83d525c68..52503e76c44 100644
--- a/addons/procurement/procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
@@ -12,7 +12,7 @@
             <field eval="False" name="doall"/>
             <field eval="'procurement.order'" name="model"/>
             <field eval="'run_scheduler'" name="function"/>
-            <field eval="'(False,)'" name="args"/>
+            <field eval="'(False,True)'" name="args"/>
         </record>
         
         <record id="sequence_mrp_op_type" model="ir.sequence.type">
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 7c9d5ec3290..6f326ccf1c5 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -36,6 +36,8 @@ class procurement_order(osv.osv):
         ''' Runs through scheduler.
         @param use_new_cursor: False or the dbname
         '''
+        if use_new_cursor:
+            use_new_cursor = cr.dbname
         self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
         self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
                 use_new_cursor=use_new_cursor, context=context)
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 885dbd1266c..a34ee77a749 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.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-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-06-27 03:25+0000\n"
+"PO-Revision-Date: 2013-07-08 14:09+0000\n"
 "Last-Translator: Alan <shuchuan.wu@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: 2013-06-28 05:42+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-09 05:16+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: project
 #: view:project.project:0
@@ -38,7 +38,7 @@ msgstr "进度"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "委派任务"
+msgstr "委派的任务"
 
 #. module: project
 #: view:project.project:0
@@ -58,18 +58,18 @@ msgstr "阶段名称"
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "设为未决"
+msgstr "设置为等待状态"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "新的基于模板的项目"
+msgstr "基于该模板新建项目"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 msgid "Day"
-msgstr "天数"
+msgstr "天"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
@@ -91,7 +91,7 @@ msgstr "警告！"
 #: help:project.project,message_unread:0
 #: help:project.task,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息，勾选此项"
+msgstr "如果选中此项，你需要注意新的消息。"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -101,12 +101,12 @@ msgstr "完成任务"
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "任务完成"
+msgstr "任务已经完成"
 
 #. module: project
 #: view:res.partner:0
 msgid "False"
-msgstr "否"
+msgstr "错误的"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -121,7 +121,7 @@ msgstr "辅助核算科目"
 #. module: project
 #: field:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Manage time estimation on tasks"
-msgstr "估计管理任务的时间"
+msgstr "管理任务的估计时间"
 
 #. module: project
 #: help:project.project,message_summary:0
@@ -129,7 +129,7 @@ msgstr "估计管理任务的时间"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
+msgstr "保存对话概要信息，这些概要信息将为直接以HTML格式插入到看板视图。"
 
 #. module: project
 #: code:addons/project/project.py:444
@@ -163,12 +163,12 @@ msgstr "重设项目"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr "进行中任务"
+msgstr "进行中的任务"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "结束任务和全部要做任务的百分比"
+msgstr "已结束任务和未结束任务的百分比。"
 
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
@@ -224,7 +224,7 @@ msgstr "分配给"
 #: model:mail.message.subtype,name:project.mt_project_task_closed
 #: model:mail.message.subtype,name:project.mt_task_closed
 msgid "Task Done"
-msgstr ""
+msgstr "已完成的任务"
 
 #. module: project
 #: view:project.project:0
@@ -265,7 +265,7 @@ msgstr "任务分派"
 #: model:mail.message.subtype,name:project.mt_project_task_started
 #: model:mail.message.subtype,name:project.mt_task_started
 msgid "Task Started"
-msgstr ""
+msgstr "已开始的任务"
 
 #. module: project
 #: view:project.task:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 587d60ff86f..6bd17f98e92 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -586,6 +586,15 @@ class task(base_stage, osv.osv):
         },
     }
 
+    def _get_default_partner(self, cr, uid, context=None):
+        """ Override of base_stage to add project specific behavior """
+        project_id = self._get_default_project_id(cr, uid, context)
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return project.partner_id.id
+        return super(task, self)._get_default_partner(cr, uid, context=context)
+
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
         return (self._resolve_project_id_from_context(cr, uid, context=context) or False)
@@ -600,7 +609,8 @@ class task(base_stage, osv.osv):
             context key, or None if it cannot be resolved to a single
             project.
         """
-        if context is None: context = {}
+        if context is None:
+            context = {}
         if type(context.get('default_project_id')) in (int, long):
             return context['default_project_id']
         if isinstance(context.get('default_project_id'), basestring):
@@ -681,13 +691,11 @@ class task(base_stage, osv.osv):
     def onchange_planned(self, cr, uid, ids, planned=0.0, effective=0.0):
         return {'value':{'remaining_hours': planned - effective}}
 
-    def onchange_project(self, cr, uid, id, project_id):
-        if not project_id:
-            return {}
-        data = self.pool.get('project.project').browse(cr, uid, [project_id])
-        partner_id=data and data[0].partner_id
-        if partner_id:
-            return {'value':{'partner_id':partner_id.id}}
+    def onchange_project(self, cr, uid, id, project_id, context=None):
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return {'value': {'partner_id': project.partner_id.id}}
         return {}
 
     def duplicate_task(self, cr, uid, map_ids, context=None):
@@ -810,8 +818,9 @@ class task(base_stage, osv.osv):
         'progress': 0,
         'sequence': 10,
         'active': True,
-        'user_id': lambda obj, cr, uid, context: uid,
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c),
+        'user_id': lambda obj, cr, uid, ctx=None: uid,
+        'company_id': lambda self, cr, uid, ctx=None: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=ctx),
+        'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx),
     }
     _order = "priority, sequence, date_start, name, id"
 
@@ -1111,11 +1120,9 @@ class task(base_stage, osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('project_id'):
-                ctx['default_project_id'] = vals['project_id']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
+        if vals.get('project_id') and not context.get('default_project_id'):
+            context['default_project_id'] = vals.get('project_id')
+
         # context: no_log, because subtype already handle this
         create_context = dict(context, mail_create_nolog=True)
         task_id = super(task, self).create(cr, uid, vals, context=create_context)
@@ -1127,11 +1134,6 @@ class task(base_stage, osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if vals.get('project_id'):
-            project_id = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
-            if project_id:
-                vals.setdefault('message_follower_ids', [])
-                vals['message_follower_ids'] += [(6, 0,[follower.id]) for follower in project_id.message_follower_ids]
         if vals and not 'kanban_state' in vals and 'stage_id' in vals:
             new_stage = vals.get('stage_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a69d9356002..91b5633f6d6 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -65,15 +65,22 @@ class project_issue(base_stage, osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('project_id'):
-                ctx['default_project_id'] = vals['project_id']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
+        if vals.get('project_id') and not context.get('default_project_id'):
+            context['default_project_id'] = vals.get('project_id')
+
         # context: no_log, because subtype already handle this
         create_context = dict(context, mail_create_nolog=True)
         return super(project_issue, self).create(cr, uid, vals, context=create_context)
 
+    def _get_default_partner(self, cr, uid, context=None):
+        """ Override of base_stage to add project specific behavior """
+        project_id = self._get_default_project_id(cr, uid, context)
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return project.partner_id.id
+        return super(project_issue, self)._get_default_partner(cr, uid, context=context)
+
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
         return self._resolve_project_id_from_context(cr, uid, context=context)
@@ -215,6 +222,10 @@ class project_issue(base_stage, osv.osv):
         return res
 
     def on_change_project(self, cr, uid, ids, project_id, context=None):
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return {'value': {'partner_id': project.partner_id.id}}
         return {}
 
     def _get_issue_task(self, cr, uid, ids, context=None):
@@ -309,6 +320,7 @@ class project_issue(base_stage, osv.osv):
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'kanban_state': 'normal',
+        'user_id': lambda obj, cr, uid, context: uid,
     }
 
     _group_by_full = {
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 4b5ad3f0e44..33cddc0123b 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-11-27 14:57+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-07 04:44+0000\n"
+"Last-Translator: Alan <shuchuan.wu@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-08 05:25+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr "指定的用户"
+msgstr "已分配的用户"
 
 #. module: project_long_term
 #: view:project.phase:0
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 881ed9b6b29..499a0259214 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -26,9 +26,9 @@
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
+                <xpath expr="//page[@string='Extra Info']//field[@name='state']" position="after">
                     <field name="sale_line_id" string="Order Line"/>
-                </field>
+                </xpath>
             </field>
         </record>
         <record id="product_product_normal_form_supply_view" model="ir.ui.view">
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index b66c7ce6f3b..1a642463df9 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -173,7 +173,7 @@ class WebKitParser(report_sxw):
                                  ),
                                 'w'
                             )
-            head_file.write(header)
+            head_file.write(header.encode('utf-8'))
             head_file.close()
             file_to_del.append(head_file.name)
             command.extend(['--header-html', head_file.name])
@@ -184,7 +184,7 @@ class WebKitParser(report_sxw):
                                  ),
                                 'w'
                             )
-            foot_file.write(footer)
+            foot_file.write(footer.encode('utf-8'))
             foot_file.close()
             file_to_del.append(foot_file.name)
             command.extend(['--footer-html', foot_file.name])
@@ -205,7 +205,7 @@ class WebKitParser(report_sxw):
         for html in html_list :
             html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
             count += 1
-            html_file.write(html)
+            html_file.write(html.encode('utf-8'))
             html_file.close()
             file_to_del.append(html_file.name)
             command.append(html_file.name)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3bf6989c157..996e2086392 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -918,7 +918,7 @@
                     <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Customer" domain="[('customer','=',True)]" />
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
                     <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
@@ -1045,7 +1045,7 @@
                     <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" />
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
                     <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>