[MERGE] merge with latest trunk

bzr revid: amb@tinyerp.com-20130711130824-mpv2o3lec8ot8qtq
2013-07-11 18:38:24 +05:30 · 2013-07-11 18:38:24 +05:30 · 5eddd3bea5
parent 98f39f9d22 ee6f6e45db
commit 5eddd3bea5
75 changed files with 11777 additions and 821 deletions
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -719,7 +719,7 @@ class account_journal(osv.osv):
        'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
        'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
        'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
-        'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
+        'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
        'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
        'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),

--- a/addons/account/i18n/is.po
+++ b/addons/account/i18n/is.po
--- 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
--- 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',
--- 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>
--- 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>
--- 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>
--- 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>
--- 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')
--- 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">
--- 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):
--- 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>
--- 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;
--- 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)


--- 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>

--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-04-26 16:01+0000\n"
+"PO-Revision-Date: 2013-07-10 09:54+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\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-27 05:44+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "Language: nl\n"

 #. module: account_voucher
@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:369
+#: code:addons/account_voucher/account_voucher.py:417
 #, python-format
 msgid "Write-Off"
 msgstr "Afschrijving"
@ -132,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Boekingsstatistieken"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@ -233,8 +233,8 @@ msgid "Journal Item"
 msgstr "Boekingslijn"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
-#: code:addons/account_voucher/account_voucher.py:981
+#: code:addons/account_voucher/account_voucher.py:558
+#: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
 msgstr "Fout"
@ -261,7 +261,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@ -313,7 +313,7 @@ msgid "Tax"
 msgstr "Btw"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie"
@ -366,10 +366,10 @@ msgid "Import Invoices"
 msgstr "Facturen importeren"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "Wrong voucher line"
-msgstr ""
+msgstr "Verkeerde betalingsregel"

 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@ -385,7 +385,7 @@ msgid "Receipt"
 msgstr "Reçu"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@ -409,7 +409,7 @@ msgstr "Periode"

 #. module: account_voucher
 #: view:account.voucher:0
-#: code:addons/account_voucher/account_voucher.py:211
+#: code:addons/account_voucher/account_voucher.py:231
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@ -430,7 +430,7 @@ msgid "Debit"
 msgstr "Debet"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Het dagboek kan niet worden gewijzigd"
@ -469,6 +469,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier als u een nieuwe leveranciersbetaling wilt maken.\n"
+"              </p><p>\n"
+"                Met OpenERP kunt u betalingen aan leveranciers opvolgen.\n"
+"              </p>\n"
+"            "

 #. module: account_voucher
 #: view:account.voucher:0
@ -536,7 +542,7 @@ msgid "Pay Invoice"
 msgstr "Factuur betalen"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Geen rekening voor basisvak en btw-vak"
@ -590,15 +596,15 @@ msgid "To Review"
 msgstr "Te controleren"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1025
-#: code:addons/account_voucher/account_voucher.py:1039
-#: code:addons/account_voucher/account_voucher.py:1194
+#: code:addons/account_voucher/account_voucher.py:1120
+#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1286
 #, python-format
 msgid "change"
 msgstr "wijzigen"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
+#: code:addons/account_voucher/account_voucher.py:1106
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@ -656,6 +662,7 @@ msgstr "Maand"
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:account.voucher.line,currency_id:0
+#: model:ir.model,name:account_voucher.model_res_currency
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
 msgstr "Munt"
@ -699,7 +706,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Betalingssaldo afpunten"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:975
+#: code:addons/account_voucher/account_voucher.py:1067
 #, python-format
 msgid "Configuration Error !"
 msgstr "Configuratiefout"
@ -764,7 +771,7 @@ msgid "October"
 msgstr "Oktober"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:976
+#: code:addons/account_voucher/account_voucher.py:1068
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Gelieve de nummering van het gekozen journaal te activeren."
@ -844,7 +851,7 @@ msgid "Previous Payments ?"
 msgstr "Vorige betalingen?"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
 msgstr "De factuur die u wilt betalen, is niet meer geldig."
@ -876,7 +883,7 @@ msgid "Active"
 msgstr "Actief"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:982
+#: code:addons/account_voucher/account_voucher.py:1074
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Gelieve een reeks in te stellen voor het journaal."
@ -1004,7 +1011,7 @@ msgid "Journal Items"
 msgstr "Boekingslijnen"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
+#: code:addons/account_voucher/account_voucher.py:558
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "Stel een standaard debet-/creditrekening in voor journaal \"%s\"."
@ -1221,7 +1228,7 @@ msgstr ""
 "Het bedrag van het reçu moet gelijk zijn aan het bedrag op de uittreksellijn."

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Een openstaand of betaald reçu kan niet meer worden verwijderd."
@ -1284,8 +1291,8 @@ msgid "Status <b>changed</b>"
 msgstr "Status <b>vgewijzigd</b>"

 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1106
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Niet volledig geconfigureerd"
--- 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)
--- 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
--- 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:
--- a/addons/base_status/i18n/sv.po
+++ 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>."
--- 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)
--- 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'),
--- 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>
--- 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">
--- a/addons/crm/doc/changelog.rst
+++ 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.
--- a/addons/crm/doc/index.rst
+++ b/addons/crm/doc/index.rst
@ -0,0 +1,13 @@
+CRM module documentation
+========================
+
+CRM documentation topics
+'''''''''''''''''''''''''
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@ -7,14 +7,19 @@ 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-21 07:11+0000\n"
+"PO-Revision-Date: 2013-07-09 07:36+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-22 05:36+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-07-10 05:25+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+msgid "Qualification"
+msgstr "Besorolás"

 #. module: crm
 #: view:crm.lead.report:0
@ -2686,11 +2691,6 @@ msgstr "Valószínűség automatikus változtatása"
 msgid "My Phone Calls"
 msgstr "Telefonhívásaim"

-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead3
-msgid "Qualification"
-msgstr "Besorolás"
-
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
@ -3961,9 +3961,19 @@ msgstr ""
 #~ msgid "Can not add note!"
 #~ msgstr "Nem lehet hozzáadni megjegyzést!"

+#, python-format
+#~ msgid ""
+#~ "Opportunity must have Partner assigned before merging with other Opportunity."
+#~ msgstr ""
+#~ "Csak a Partnerhez rendelt Lehetőséget lehet más Lehetőséggel összefűzni."
+
 #~ msgid "_Merge"
 #~ msgstr "Össze_fésülés"

+#, python-format
+#~ msgid "The opportunity '%s' has been marked as lost."
+#~ msgstr "A '%s' lehetőséget elvesztettnek jelöltem."
+
 #, python-format
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "A '%s'"
@ -3991,3 +4001,17 @@ msgstr ""

 #~ msgid "Convert To Opportunity"
 #~ msgstr "Átalakítás lehetőséggé"
+
+#~ msgid "Edit all Occurrences  of recurrent Meeting."
+#~ msgstr "Az ismétlődő találkozók összes eseményének szerkesztése."
+
+#~ msgid ""
+#~ "Leads Analysis allows you to check different CRM related information. Check "
+#~ "for treatment delays, number of responses given and emails sent. You can "
+#~ "sort out your leads analysis by different groups to get accurate grained "
+#~ "analysis."
+#~ msgstr ""
+#~ "Az érdeklődések elemzése több CRM-hez kapcsolódó információt nyújt. "
+#~ "Ellenőrizhetjük az eljárás elnapolását, a kiküldött válaszok és e-mailek "
+#~ "számát. A részletes eredmény érdekében az érdeklődéseket különféle "
+#~ "csoportosítások szerint is elemezhetjük."
--- 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')
--- 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.
 -
--- 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
--- 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.
 -
--- 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
    # -------------------------------------------------------
--- 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">
--- 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"
--- 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),
--- 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',
--- a/addons/edi/i18n/is.po
+++ b/addons/edi/i18n/is.po
@ -0,0 +1,87 @@
+# Icelandic 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-10 12:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr "Ástæða:"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Gjaldmiðill"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Viðskipta aðili"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
--- 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>
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@ -322,7 +322,7 @@
                                </tree>
                            </field>
                       </page>
-                       <page string="Other Information">
+                       <page string="Accounting Information">
                            <group>
                                <group string="Miscellaneous">
                                    <field name="company_id" groups="base.group_multi_company"/>
--- a/addons/hr_recruitment/openerp.py
+++ b/addons/hr_recruitment/openerp.py
@ -47,7 +47,6 @@ You can define the different phases of interviews and easily rate the applicant
        'fetchmail',
    ],
    'data': [
-        'wizard/hr_recruitment_employee_hired.xml',
        'wizard/hr_recruitment_create_partner_job_view.xml',
        'hr_recruitment_view.xml',
        'hr_recruitment_menu.xml',
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@ -22,7 +22,7 @@
        <field name="res_model">hr.applicant</field>
        <field name="view_type">form</field>
        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','open'))]</field>
+        <field name="domain">[('stage_id.fold', '!=', True)]</field>
        <field name="view_id" ref="view_applicants_status_tree"/>
    </record>

--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@ -0,0 +1,16 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``hr.applicant``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Removed ``date`` field not used anywhere. Updated reports.
+  - ``hr.recruitment.stage``: removed ``state`` field.
+
+- Removed ``hired.employee`` wizard.
--- a/addons/hr_recruitment/doc/index.rst
+++ b/addons/hr_recruitment/doc/index.rst
@ -0,0 +1,22 @@
+=====================
+HR Recruitment DevDoc
+=====================
+
+Hr Recruitment module documentation
+===================================
+
+Documentation topics
+''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
--- a/addons/hr_recruitment/doc/stage_status.rst
+++ b/addons/hr_recruitment/doc/stage_status.rst
@ -0,0 +1,54 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
+++++
+
+This revision removed the concept of state on hr.applicant objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``hr.applicant`` now use only stages. However a convention still exists about
+   'New' stage. An applicant is consdered as ``new`` when it has the following
+   properties:
+
+   - ``stage_id and stage_id.sequence = 1``
+
+ - ``hr.recruitment.stage`` do not have any ``state`` field anymore. 
+ - ``hr.recruitment.report`` do not have any ``state`` field anymore. 
+
+By default a newly created applicant be in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+Employee creation is still feasible directly from a link button in the form view.
+
+Stage analysis
++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``hr.recruitment.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
+++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
++++++++
+
+The following subtypes are triggered on ``hr.applicant``:
+
+ - ``mt_applicant_new``: new applicants. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_applicant_stage_changed``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+
+The following subtype is trigerred on ``hr.job``:
+
+ - ``mt_job_new_applicant``: new applicant in the job.
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@ -19,23 +19,13 @@
 #
 ##############################################################################

-import time
 from openerp import tools

-from openerp.addons.base_status.base_stage import base_stage
 from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext

-AVAILABLE_STATES = [
-    ('draft', 'New'),
-    ('cancel', 'Refused'),
-    ('open', 'In Progress'),
-    ('pending', 'Pending'),
-    ('done', 'Hired')
-]
-
 AVAILABLE_PRIORITIES = [
    ('', ''),
    ('5', 'Not Good'),
@ -62,13 +52,11 @@ class hr_recruitment_stage(osv.osv):
        'name': fields.char('Name', size=64, required=True, translate=True),
        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
        'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."),
        'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
        'requirements': fields.text('Requirements'),
    }
    _defaults = {
        'sequence': 1,
-        'state': 'draft',
        'fold': False,
    }

@ -87,18 +75,15 @@ class hr_recruitment_degree(osv.osv):
        ('name_uniq', 'unique (name)', 'The name of the Degree of Recruitment must be unique!')
    ]

-class hr_applicant(base_stage, osv.Model):
+class hr_applicant(osv.Model):
    _name = "hr.applicant"
    _description = "Applicant"
    _order = "id desc"
    _inherit = ['mail.thread', 'ir.needaction_mixin']
    _track = {
-        'state': {
-            'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj.state == 'done',
-            'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancel',
-        },
        'stage_id': {
-            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.state not in ['done', 'cancel'],
+            'hr_recruitment.mt_applicant_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
+            'hr_recruitment.mt_applicant_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
        },
    }

@ -109,7 +94,7 @@ class hr_applicant(base_stage, osv.Model):
    def _get_default_stage_id(self, cr, uid, context=None):
        """ Gives default stage_id """
        department_id = self._get_default_department_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], department_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)

    def _resolve_department_id_from_context(self, cr, uid, context=None):
        """ Returns ID of department based on the value of 'default_department_id'
@ -197,20 +182,12 @@ class hr_applicant(base_stage, osv.Model):
        'write_date': fields.datetime('Update Date', readonly=True),
        'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',
                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=AVAILABLE_STATES, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
        'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
        'company_id': fields.many2one('res.company', 'Company'),
        'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'),
-        # Applicant Columns
        'date_closed': fields.datetime('Closed', readonly=True, select=True),
-        'date_open': fields.datetime('Opened', readonly=True, select=True),
-        'date': fields.datetime('Date'),
+        'date_open': fields.datetime('Assigned', readonly=True, select=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
        'date_action': fields.date('Next Action Date'),
        'title_action': fields.char('Next Action', size=64),
        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
@ -234,40 +211,36 @@ class hr_applicant(base_stage, osv.Model):
        'day_close': fields.function(_compute_day, string='Days to Close', \
                                multi='day_close', type="float", store=True),
        'color': fields.integer('Color Index'),
-        'emp_id': fields.many2one('hr.employee', 'employee'),
+        'emp_id': fields.many2one('hr.employee', string='Employee',
+            help='Employee linked to the applicant.'),
        'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
    }

    _defaults = {
        'active': lambda *a: 1,
-        'user_id':  lambda s, cr, uid, c: uid,
-        '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),
        'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
        'color': 0,
+        'date_last_stage_update': fields.datetime.now(),
    }

    _group_by_full = {
        'stage_id': _read_group_stage_ids
    }

-    def onchange_job(self, cr, uid, ids, job, context=None):
-        result = {}
+    def onchange_job(self, cr, uid, ids, job_id=False, context=None):
+        if job_id:
+            job_record = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
+            if job_record and job_record.department_id:
+                return {'value': {'department_id': job_record.department_id.id}}
+        return {}

-        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}}
-
-    def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
-        obj_recru_stage = self.pool.get('hr.recruitment.stage')
-        list_stage_ids = obj_recru_stage.search(cr, uid, ['|',('department_id','=',department_id),('department_id','=',False)], context=context)
-        if ids:
-            stage_ids = self.browse(cr, uid,ids,context=context)[0].stage_id.id
-            return {'value': {'stage_id': stage_ids}}
-        return {'value': {'stage_id': list_stage_ids[0]}}
+    def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
+        if not stage_id:
+            stage_id = self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
+        return {'value': {'stage_id': stage_id}}

    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
        data = {'partner_phone': False,
@ -405,27 +378,31 @@ 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:
            self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context)
        return obj_id

-    def case_open(self, cr, uid, ids, context=None):
-        """
-            open Request of the applicant for the hr_recruitment
-        """
-        res = super(hr_applicant, self).case_open(cr, uid, ids, context)
-        date = self.read(cr, uid, ids, ['date_open'])[0]
-        if not date['date_open']:
-            self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
-        return res
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # stage change: update date_last_stage_update
+        if 'stage_id' in vals:
+            vals['date_last_stage_update'] = fields.datetime.now()
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()

-    def case_close(self, cr, uid, ids, context=None):
-        res = super(hr_applicant, self).case_close(cr, uid, ids, context)
-        return res
+        return super(hr_applicant, self).write(cr, uid, ids, vals, context=context)

-    def case_close_with_emp(self, cr, uid, ids, context=None):
+    def create_employee_from_applicant(self, cr, uid, ids, context=None):
+        """ Create an hr.employee from the hr.applicants """
        if context is None:
            context = {}
        hr_employee = self.pool.get('hr.employee')
@ -435,17 +412,16 @@ class hr_applicant(base_stage, osv.Model):
        for applicant in self.browse(cr, uid, ids, context=context):
            address_id = contact_name = False
            if applicant.partner_id:
-                address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact']
-                contact_name = self.pool.get('res.partner').name_get(cr,uid,[applicant.partner_id.id])[0][1]
+                address_id = self.pool.get('res.partner').address_get(cr, uid, [applicant.partner_id.id], ['contact'])['contact']
+                contact_name = self.pool.get('res.partner').name_get(cr, uid, [applicant.partner_id.id])[0][1]
            if applicant.job_id and (applicant.partner_name or contact_name):
                applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
-                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or contact_name,
+                emp_id = hr_employee.create(cr, uid, {'name': applicant.partner_name or contact_name,
                                                     'job_id': applicant.job_id.id,
                                                     'address_home_id': address_id,
                                                     'department_id': applicant.department_id.id
                                                     })
                self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
-                self.case_close(cr, uid, [applicant.id], context)
            else:
                raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))

@ -456,26 +432,6 @@ class hr_applicant(base_stage, osv.Model):
        dict_act_window['view_mode'] = 'form,tree'
        return dict_act_window

-    def case_cancel(self, cr, uid, ids, context=None):
-        """Overrides cancel for crm_case for setting probability
-        """
-        res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_pending(self, cr, uid, ids, context=None):
-        """Marks case as pending"""
-        res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(hr_applicant, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
-        return res
-
    def set_priority(self, cr, uid, ids, priority, *args):
        """Set applicant priority
        """
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@ -51,34 +51,29 @@
        <field name="name">Doctoral Degree</field>
        <field name="sequence">4</field>
    </record>
+
    <record model="hr.recruitment.stage" id="stage_job1">
        <field name="name">Initial Qualification</field>
-        <field name="state">draft</field>
        <field name="sequence">1</field>
    </record>
    <record model="hr.recruitment.stage" id="stage_job2">
        <field name="name">First Interview</field>
-        <field name="state">open</field>
        <field name="sequence">2</field>
    </record>
    <record model="hr.recruitment.stage" id="stage_job3">
        <field name="name">Second Interview</field>
-        <field name="state">open</field>
        <field name="sequence">3</field>
    </record>
    <record model="hr.recruitment.stage" id="stage_job4">
        <field name="name">Contract Proposed</field>
-        <field name="state">pending</field>
        <field name="sequence">4</field>
    </record>
    <record model="hr.recruitment.stage" id="stage_job5">
        <field name="name">Contract Signed</field>
-        <field name="state">done</field>
        <field name="sequence">5</field>
    </record>
    <record model="hr.recruitment.stage" id="stage_job6">
        <field name="name">Refused</field>
-        <field name="state">cancel</field>
        <field name="sequence">6</field>
        <field name="fold" eval="True"/>
    </record>
@ -467,24 +462,24 @@
        <field name="res_model">hr.job</field>
    </record>
    <!-- Applicant-related subtypes for messaging / Chatter -->
-    <record id="mt_stage_changed" model="mail.message.subtype">
+    <record id="mt_applicant_new" model="mail.message.subtype">
+        <field name="name">New Applicant</field>
+        <field name="res_model">hr.applicant</field>
+        <field name="default" eval="False"/>
+        <field name="description">Applicant created</field>
+    </record>
+    <record id="mt_applicant_stage_changed" model="mail.message.subtype">
        <field name="name">Stage Changed</field>
        <field name="res_model">hr.applicant</field>
        <field name="default" eval="False"/>
        <field name="description">Stage changed</field>
    </record>
-    <record id="mt_applicant_hired" model="mail.message.subtype">
+    <record id="mt_applicant_employee" model="mail.message.subtype">
        <field name="name">Applicant Hired</field>
        <field name="res_model">hr.applicant</field>
        <field name="default" eval="False"/>
        <field name="description">Applicant hired</field>
    </record>
-    <record id="mt_applicant_refused" model="mail.message.subtype">
-        <field name="name">Applicant Refused</field>
-        <field name="res_model">hr.applicant</field>
-        <field name="default" eval="False"/>
-        <field name="description">Applicant refused</field>
-    </record>
    <!-- Applicant Categories(Tag) -->
    <record id="tag_applicant_reserve" model="hr.applicant_category">
        <field name="name">Reserve</field>
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@ -39,9 +39,10 @@
        <field name="name">Applicants</field>
        <field name="model">hr.applicant</field>
        <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+            <tree string="Applicants" fonts="bold:message_unread==True">
                <field name="message_unread" invisible="1"/>
                <field name="create_date"/>
+                <field name="date_last_stage_update" invisible="1"/>
                <field name="name" string="Subject"/>
                <field name="partner_name"/>
                <field name="email_from"/>
@ -58,7 +59,6 @@
                <field name="availability" invisible="1"/>
                <field name="department_id" invisible="context.get('invisible_department', True)"/>
                <field name="user_id"/>
-                <field name="state" invisible="1"/>
            </tree>
        </field>
    </record>
@ -69,13 +69,7 @@
        <field name="arch" type="xml">
          <form string="Jobs - Recruitment Form" version="7.0">
            <header>
-                <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
-                        class="oe_highlight"
-                        attrs="{'invisible':['|', ('emp_id','!=',False), ('state','=','cancel')]}"/>
-                <button name="case_cancel" string="Refuse" type="object"
-                        states="draft,open,pending" class="oe_highlight"/>
                <field name="stage_id" widget="statusbar" clickable="True"/>
-                <field name="emp_id" invisible="1"/>
            </header>
            <sheet>
                <div class="oe_right oe_button_box">
@ -93,9 +87,12 @@
                    <label for="name" class="oe_edit_only"/>
                    <h1><field name="name"/></h1>
                    <label for="partner_name" class="oe_edit_only"/>
-                    <h2>
+                    <h2 style="display: inline-block;">
                        <field name="partner_name" class="oe_inline"/>
                    </h2>
+                    <button string="Create Employee" name="create_employee_from_applicant" type="object"
+                                    class="oe_link oe_inline" style="margin-left: 8px;"
+                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
                </div>
                <group>
                    <group>
@ -115,7 +112,6 @@
                            <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                        </div>
                        <field name="priority"/>
-                        <field name="state" invisible="1"/>
                        <field name="source_id"/>
                        <field name="reference"/>
                    </group>
@ -123,7 +119,7 @@
                        <field name="survey" invisible="1"/>
                        <field name="response" invisible="1"/>
                        <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id, stage_id)"/>
                        <label for="availability"/>
                        <div>
                            <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
@ -142,6 +138,7 @@
                            <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}"> + </span>
                            <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                        </div>
+                        <field name="emp_id" readonly="1"/>
                    </group>
                </group>
                <group>
@ -165,7 +162,7 @@
              <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
                <field name="job_id"/>
                <field name="salary_expected" operator="+"/>
-                <field name="state" group="True"/>
+                <field name="stage_id" group="True"/>
            </graph>
        </field>
    </record>
@ -174,22 +171,22 @@
        <field name="name">Jobs - Recruitment Search</field>
        <field name="model">hr.applicant</field>
        <field name="arch" type="xml">
-            <search string="Search Jobs">
+            <search string="Search Applicants">
                <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+                <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
+                <filter string="My" domain="[('user_id', '=', uid)]"/>
+                <separator/>
                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                <separator/>
-                <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
-                <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
-                <filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
-                <separator/>
-                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
-                <separator/>
                <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"/>
+                <field name="stage_id" domain="[]"/>
                <separator/>
                <field name="categ_ids"/>
+                <separator/>
                <group expand="0" string="Group By...">
                    <filter string="Responsible" domain="[]"  context="{'group_by':'user_id'}"/>
                    <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
@ -200,6 +197,7 @@
                    <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                    <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/>
                    <filter string="Creation Date" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/>
                </group>
           </search>
        </field>
@ -342,7 +340,6 @@
                <field name="sequence" invisible="1"/>
                <field name="name"/>
                <field name="department_id"/>
-                <field name="state"/>
            </tree>
        </field>
    </record>
@ -360,7 +357,6 @@
                        <field name="department_id"/>
                    </group>
                    <group>
-                        <field name="state"/>
                        <field name="sequence"/>
                        <field name="fold"/>
                    </group>
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@ -18,30 +18,24 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from .. import hr_recruitment
 from openerp.addons.decimal_precision import decimal_precision as dp


-AVAILABLE_STATES = [
-    ('draft','New'),
-    ('open','Open'),
-    ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending','Pending')
-]
-
-class hr_recruitment_report(osv.osv):
+class hr_recruitment_report(osv.Model):
    _name = "hr.recruitment.report"
    _description = "Recruitments Statistics"
    _auto = False
-    _rec_name = 'date'
+    _rec_name = 'date_create'
+    _order = 'date_create desc'

    _columns = {
        'user_id': fields.many2one('res.users', 'User', readonly=True),
        'nbr': fields.integer('# of Applications', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
+        # TDE TODO: use MONTHS
        'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                  ('03', 'March'), ('04', 'April'),\
                                  ('05', 'May'), ('06', 'June'), \
@ -51,7 +45,8 @@ class hr_recruitment_report(osv.osv):
        'company_id': fields.many2one('res.company', 'Company', readonly=True),
        'day': fields.char('Day', size=128, readonly=True),
        'year': fields.char('Year', size=4, readonly=True),
-        'date': fields.date('Date', readonly=True),
+        'date_create': fields.date('Create Date', readonly=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True),
        'date_closed': fields.date('Closed', readonly=True),
        'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
        'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
@ -67,19 +62,19 @@ class hr_recruitment_report(osv.osv):
        'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                       help="Number of Days to close the project issue"),
    }
-    _order = 'date desc'
+    
    def init(self, cr):
        tools.drop_view_if_exists(cr, 'hr_recruitment_report')
        cr.execute("""
            create or replace view hr_recruitment_report as (
                 select
                     min(s.id) as id,
-                     date_trunc('day',s.create_date) as date,
+                     date_trunc('day',s.create_date) as date_create,
                     date_trunc('day',s.date_closed) as date_closed,
+                     date_trunc('day',s.date_last_stage_update) as date_last_stage_update,
                     to_char(s.create_date, 'YYYY') as year,
                     to_char(s.create_date, 'MM') as month,
                     to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     s.state,
                     s.partner_id,
                     s.company_id,
                     s.user_id,
@ -93,7 +88,7 @@ class hr_recruitment_report(osv.osv):
                     (sum(salary_proposed)/count(*)) as salary_prop_avg,
                     sum(salary_expected) as salary_exp,
                     (sum(salary_expected)/count(*)) as salary_exp_avg,
-                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
+                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close,
                     count(*) as nbr
                 from hr_applicant s
                 group by
@ -105,7 +100,7 @@ class hr_recruitment_report(osv.osv):
                     s.date_open,
                     s.create_date,
                     s.date_closed,
-                     s.state,
+                     s.date_last_stage_update,
                     s.partner_id,
                     s.company_id,
                     s.user_id,
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@ -6,7 +6,7 @@
        <field name="model">hr.recruitment.report</field>
        <field name="arch" type="xml">
            <tree string="Recruitment Analysis" create="false">
-                <field name="date" invisible="1"/>
+                <field name="date_create" invisible="1"/>
                <field name="user_id" invisible="1"/>
                <field name="job_id"/>
                <field name="stage_id" invisible="1" />
@ -14,10 +14,10 @@
                <field name="type_id" invisible="1"/>
                <field name="partner_id" invisible="1"/>
                <field name="company_id" groups="base.group_multi_company" invisible="1"/>
-                <field name="state" invisible="1"/>
                <field name="year" invisible="1"/>
                <field name="day" invisible="1"/>
                <field name="month" invisible="1"/>
+                <field name="date_last_stage_update" invisible="1"/>
                <field name="nbr" sum="# of Applications"/>
                <field name="available" sum="Available"/>
                <field name="salary_exp" sum="Expected Salary"/>
@ -46,34 +46,33 @@
        <field name="model">hr.recruitment.report</field>
        <field name="arch" type="xml">
            <search string="Recruitment Analysis">
-                <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
-                <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
-                <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
-                <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
-                <separator/>
-                <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
                <field name="job_id"/>
                <field name="department_id"/>
-                <field name="user_id" string="Responsible"/>
+                <field name="user_id"/>
+                <filter string="New" domain="[('sequence', '=', 1)]"/>
+                <separator/>
+                <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
+                <filter string="My" domain="[('user_id', '=', uid)]"/>
+                <separator/>
                <group expand="0" string="Extended Filters...">
-                    <!--field name="job_id"/-->
                    <field name="priority"/>
                    <field name="stage_id"/>
                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="date" string="Creation Date"/>
+                    <field name="date_create"/>
                    <field name="date_closed"/>
                </group>
                <group expand="1" string="Group By ...">
-                   <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
-                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-                   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-                   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
+                   <filter string="Responsible" name='User' context="{'group_by':'user_id'}"/>
+                   <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" context="{'group_by':'partner_id'}" />
+                   <filter string="Jobs" name="job" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" context="{'group_by':'type_id'}"/>
+                   <filter string="Stage" context="{'group_by':'stage_id'}" />
+                   <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" />
+                   <filter string="Day" name="day" context="{'group_by':'day'}" help="Creation Date"/>
+                   <filter string="Month" context="{'group_by':'month'}" help="Creation Date"/>
+                   <filter string="Year" context="{'group_by':'year'}" help="Creation Date"/>
                </group>
            </search>
        </field>
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@ -17,33 +17,8 @@
    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.pdf'),('res_model','=',self._name),('res_id','=',applicant.id)])
    assert applicant.name == "Application for the post of Jr.application Programmer.", "Applicant name does not match."
    assert applicant.stage_id.id == ref('hr_recruitment.stage_job1'), "Stage should be 'Initial qualification' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "draft", "Applicant state should be 'draft'."
+    assert applicant.stage_id.sequence == 1, "Applicant stage sequence should be 1."
    assert len(resume_ids), "Resume is not attached."
-
-  I refuse the applicant (hr_case_programmer)
-
-  !python {model: hr.applicant}: |
-    self.case_cancel(cr, uid, [ref("hr_case_programmer")])
-
-  I check the details of the refused applicant.
-
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job6'), "Stage should be 'Refused' and is %s." % (applicant.stage_id.name)
-    assert applicant.state == 'cancel', "Applicant is not in 'cancel' state."
-
-  I reset and re-open the previously refused applicant.
-
-  !python {model: hr.applicant}: |
-    self.case_reset(cr, uid, [ref("hr_case_programmer")])
-    self.case_open(cr, uid, [ref("hr_case_programmer")])
-
-  I check the details of the re-opened applicant.
-
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job2'), "Stage should be 'First interview' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "open", "Applicant state should be 'open'."
 -
  I assign the Job position to the applicant
 -
@ -54,21 +29,6 @@
 -
  !python {model: hr.applicant}: |
     self.action_makeMeeting(cr, uid, [ref('hr_case_programmer')])
-
-  I check Initial Qualification of applicant.
-
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
-
-  I schedule First Interview of applicant.
-
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
-
-  On a successful First Interview of applicant, I schedule Second Interview.
-
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
 -
  Applicant fillup the answer of the interview quetion.
 -
@ -83,40 +43,8 @@
  I print Applicant fill up the interview quetion
 -
  !python {model: hr.applicant}: |
-    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
-
-  On a successful Second Interview of applicant Contract is Proposed to applicant.
-
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
-     self.stage_previous(cr, uid, [ref('hr_case_programmer')])
-
-  I Hired Applicant.
-
-  !python {model: hr.applicant}: |
-     self.case_close_with_emp(cr, uid, [ref('hr_case_programmer')])
-
-  I check that applicant is "Hired".
-
-  !assert {model: hr.applicant, id: hr_case_programmer, string: Applicant state is done}:
-    - state == 'done'
-
-  I do not give employment to the hired the applicant.
-
-  !python {model: hired.employee}: |
    context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
-    emp_id = self.create(cr, uid, {}, context=context)
-    self.case_close(cr, uid, [emp_id], context=context)
-
-  Now I give employment to hired applicant .
-
-  !python {model: hr.applicant}: |
-     hired_emp_obj = self.pool.get('hired.employee')
-     self.case_reset(cr, uid, [ref("hr_case_programmer")])
-     self.case_open(cr, uid, [ref("hr_case_programmer")])
-     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
-     emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
-     hired_emp_obj.case_close_with_emp(cr, uid, [emp_hr_id], context=context)
+    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
 -
  Now hired employee want to be a partner of company.
 -
--- a/addons/hr_recruitment/wizard/init.py
+++ b/addons/hr_recruitment/wizard/init.py
@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@ -19,9 +19,7 @@
 #
 ##############################################################################

-
 import hr_recruitment_create_partner_job
-import hr_recruitment_employee_hired

 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class hired_employee(osv.osv_memory):
-    _name = 'hired.employee'
-    _description = 'Create Employee'
-
-    def case_close(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        if context is None:
-            context = {}
-        self.pool.get('hr.applicant').case_close(cr, uid,context.get('active_ids',[]))
-        return {}
-
-    def case_close_with_emp(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        """
-        if context is None:
-            context = {}
-        return self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_hr_recruitment_hired_employee" model="ir.ui.view">
-            <field name="name">hr.recruitment.hired2employee.form</field>
-            <field name="model">hired.employee</field>
-            <field name="arch" type="xml">
-                <form string="Create New Employee" version="7.0">
-                    <header>
-                        <button name="case_close_with_emp" string="Yes" type="object" class="oe_highlight" />
-                        <button name="case_close" string="No" type="object"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Would you like to create an employee ?"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_hr_recruitment_hired_employee" model="ir.actions.act_window">
-            <field name="name">Create Employee</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hired.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
--- 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
--- 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>
--- 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'],
--- 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):
--- 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>
--- 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

--- 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)
--- 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),
                                                        '|',
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@ -967,6 +967,24 @@ openerp.mail = function (session) {
            this.$('.oe_reply').on('click', this.on_message_reply);
            this.$('.oe_star').on('click', this.on_star);
            this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+        },
+
+        on_record_clicked: function  (event) {
+            event.stopPropagation();
+            var state = {
+                'model': this.model,
+                'id': this.res_id,
+                'title': this.record_name
+            };
+            session.webclient.action_manager.do_push_state(state);
+            this.do_action({
+                res_model: state.model,
+                res_id: state.id,
+                type: 'ir.actions.act_window',
+                views: [[false, 'form']]
+            });
+            return false;
        },

        /* Call the on_compose_message on the thread of this message. */
--- 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

--- 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)
--- a/addons/portal_anonymous/i18n/zh_CN.po
+++ 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 "用户名"
--- 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">
--- 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)
--- 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
--- 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')
--- 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 = {
--- 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
--- 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">
--- 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)
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.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-01-11 08:34+0000\n"
+"PO-Revision-Date: 2013-07-09 07:56+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:22+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-10 05:26+0000\n"
+"X-Generator: Launchpad (build 16696)\n"

 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@ -129,7 +129,7 @@ msgid "March"
 msgstr "Március"

 #. module: sale
-#: code:addons/sale/sale.py:567
+#: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
 msgstr "Először vonja vissza a megrendelés összes számla mellékletét."
@ -173,7 +173,7 @@ msgstr "Árajánlat megerősítve"
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "Számlázási hiba"
+msgstr "Számlázási kivétel"

 #. module: sale
 #: view:sale.order:0
@ -183,7 +183,7 @@ msgstr "Árajánlat "
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr "Árajánlat sablon"
+msgstr "Árajánlat tervezet"

 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@ -205,7 +205,7 @@ msgstr "Engedélyezi a köteg számlázást a megrendeléseken a naplók alapjá
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Részösszeg"
+msgstr "Nettó érték"

 #. module: sale
 #: view:sale.report:0
@ -259,12 +259,12 @@ msgstr "Lehetővé teszi a megrendelés soraihoz árengedmény alkalmazását"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr "Megrendelés sorai melyek 'elvégezve' állapotúak"
+msgstr "'Elvégzett' állapotú megrendelési sorok"

 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "Megendelésre"
+msgstr "megrendelésre"

 #. module: sale
 #: field:sale.order,message_ids:0
@ -285,7 +285,7 @@ msgstr "Adók"
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Nettó érték"
+msgstr "Nettó összeg"

 #. module: sale
 #: field:sale.config.settings,module_project:0
@ -294,9 +294,9 @@ msgstr "Projekt"

 #. module: sale
 #: code:addons/sale/sale.py:185
-#: code:addons/sale/sale.py:368
-#: code:addons/sale/sale.py:509
-#: code:addons/sale/sale.py:600
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
 #: code:addons/sale/sale.py:763
 #: code:addons/sale/sale.py:780
 #, python-format
@ -306,7 +306,7 @@ msgstr "Hiba!"
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr "Nettó ár:"
+msgstr "Nettó érték :"

 #. module: sale
 #: help:sale.order.line,type:0
@ -315,9 +315,9 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
-"Raktárról: Ha kell, a terméket a raktárról vesszük vagy várunk az alkatrész "
-"feltöltésre.\n"
-"Megrendelve: Ha kell, a terméket megvásároljuk vagy legyártjuk."
+"Raktárról: Ha szükség van rá, a terméket a raktárról vesszük vagy várunk az "
+"alkatrész feltöltésre.\n"
+"Megrendelve: Ha szükség van rá, a terméket megvásároljuk vagy legyártjuk."

 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@ -344,7 +344,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "Visszavonva"
+msgstr "Érvénytelenített"

 #. module: sale
 #: view:sale.order.line:0
@ -416,11 +416,11 @@ msgid ""
 msgstr ""
 "Használja mindet a végszámla elkészítéséhez.\n"
 "                Használjon százalékot a teljes mennyiség bizonyos "
-"százalékának szálázásához.\n"
+"százalékának számlázásához.\n"
 "                Használjon fix árat egy bizonyos mennyiség díjbekérőjéhez / "
 "előlegéhez.\n"
 "                Használjon egyes megrendelés sorokat a kiválasztott "
-"megrendelés sorainak számlázásáahoz."
+"megrendelés sorainak számlázásához."

 #. module: sale
 #: view:sale.make.invoice:0
@ -431,10 +431,10 @@ msgstr "Számlák létrehozása"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr "ÁFA"
+msgstr "Adó"

 #. module: sale
-#: code:addons/sale/sale.py:278
+#: code:addons/sale/sale.py:277
 #: code:addons/sale/sale.py:820
 #: code:addons/sale/sale.py:983
 #, python-format
@ -456,7 +456,7 @@ msgstr ""
 "elvégzésekkor               egy számla érvényesítésekor (Számla kizárás) "
 "vagy a kiválogatási lista műveletekben (Szállítási kizárás).\n"
 "A 'Ütemezésre várakozás' állapot lesz beállítva, ha a számla megerősített    "
-"                        de vár egy, a megrendelés dátumára futó ütemezésre."
+"                        de vár egy, a megrendelés dátumán futó ütemezésre."

 #. module: sale
 #: field:sale.report,date_confirm:0
@ -467,7 +467,7 @@ msgstr "Megerősítés dátuma"
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "Sorok száma"
+msgstr "# sorok száma"

 #. module: sale
 #: help:sale.order,message_summary:0
@ -482,7 +482,7 @@ msgstr ""
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"A megrendelés sorrendet adja ha a megrendelési sorok listáját jelzi ki."
+"A megrendelés sorrendet adja a megrendelési sorok listájának kijelzésekor."

 #. module: sale
 #: view:sale.report:0
@ -496,7 +496,7 @@ msgid "Fax :"
 msgstr "Fax:"

 #. module: sale
-#: code:addons/sale/sale.py:278
+#: code:addons/sale/sale.py:277
 #, python-format
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
@ -507,7 +507,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr "(Frissítés)"
+msgstr "(frissítés)"

 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
@ -522,8 +522,8 @@ msgid "Contract Features"
 msgstr "Szerződés tulajdonságai"

 #. module: sale
-#: code:addons/sale/sale.py:288
-#: code:addons/sale/sale.py:586
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
@ -533,7 +533,7 @@ msgstr "Szerződés tulajdonságai"
 #: selection:sale.order,state:0
 #, python-format
 msgid "Sales Order"
-msgstr "Értékesítési megbízás"
+msgstr "Vevői megrendelés"

 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
@ -543,7 +543,7 @@ msgstr "Megrendelés sorai számlázásának engedélyezése"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Értékesítési megbízási sor"
+msgstr "Vevői megrendelés sor"

 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@ -553,7 +553,7 @@ msgstr "Előleg összege"
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sales order has at least one invoice."
-msgstr "Ez mutatja, hogy a megrendelének legalább egy számlája van."
+msgstr "Ez mutatja, hogy a megrendelésnek legalább egy számlája van."

 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@ -568,7 +568,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr "Egy munkavállalónak különböző funkciója lehet egy szerződésen belül"
+msgstr "Egy alkalmazottnak különböző funkciója lehet egy szerződésen belül"

 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@ -583,19 +583,19 @@ msgstr "Alapértelmezett fizetési feltétel"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr "Megerősítés"
+msgstr "Jóváhagyás"

 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Az időkimutatások alapján készítsen elő számlát"
+msgstr "Az időkimutatások alapján készítsen elő,  számlát"

 #. module: sale
 #: code:addons/sale/sale.py:820
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
-"Nem tud olyan megrendelési sort visszavonni amelyik már számlázva volt."
+"Nem tud olyan vevői megrendelési sort visszavonni amelyik már számlázva volt."

 #. module: sale
 #: view:account.invoice.report:0
@ -644,7 +644,7 @@ msgstr "Megrendelés száma"
 #: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "Megrendelési tételek"
+msgstr "Megrendelés sorok"

 #. module: sale
 #: report:sale.order:0
@ -673,7 +673,7 @@ msgstr "Összérték"
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
-"Lehetővé teszi az analitikus/elemző könyvelés meghatározását a "
+"Lehetővé teszi az analitikus/elemző könyvelés gyűjtőkód meghatározását a "
 "megrendeléseken."

 #. module: sale
@ -711,7 +711,7 @@ msgstr "Óra"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr "# megrendelésből"
+msgstr "# megrendelésszámból"

 #. module: sale
 #: help:sale.config.settings,timesheet:0
@ -742,7 +742,7 @@ msgstr "Számlázandó"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr "Az aktuális értékesítési megbízás számlázási címe."
+msgstr "Az aktuális megrendelés számlázási címe."

 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@ -769,7 +769,7 @@ msgstr "Mennyiség"
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr "Bruttó ár:"
+msgstr "Összesen :"

 #. module: sale
 #: view:sale.order.line:0
@ -837,7 +837,7 @@ msgstr "Beállítási hiba!"
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr "Analitikus/elemző könyvelés az értékesítésekhez"
+msgstr "Analitikus/elemző könyvelési gyűjtőkód az értékesítésekhez"

 #. module: sale
 #: view:sale.order:0
@ -889,7 +889,7 @@ msgid "Sales Order done"
 msgstr "Megrendelés elvégezve"

 #. module: sale
-#: code:addons/sale/sale.py:369
+#: code:addons/sale/sale.py:364
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
@ -945,7 +945,7 @@ msgid "Sales Make Invoice"
 msgstr "Számla generálása értékesítésből"

 #. module: sale
-#: code:addons/sale/sale.py:308
+#: code:addons/sale/sale.py:307
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Árlista figyelmeztés!"
@ -956,7 +956,7 @@ msgid "Discount (%)"
 msgstr "Árengedmény (%)"

 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_line_invoice.py:107
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@ -1009,7 +1009,7 @@ msgstr "Hónap"
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "Currency"
-msgstr "Valuta"
+msgstr "Pénznem"

 #. module: sale
 #: view:sale.order.line:0
@ -1023,7 +1023,7 @@ msgid "Category of Product"
 msgstr "Termékkaterógia"

 #. module: sale
-#: code:addons/sale/sale.py:566
+#: code:addons/sale/sale.py:564
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "Nem lehet megszakítani ezt a megrendelést!"
@ -1080,7 +1080,7 @@ msgid "Open Sale Menu"
 msgstr "Értékesítési menü megnyitása"

 #. module: sale
-#: code:addons/sale/sale.py:600
+#: code:addons/sale/sale.py:598
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
 msgstr "Nem tud megerősíteni sor nélküli megrendelést"
@ -1520,7 +1520,7 @@ msgid "TVA :"
 msgstr "ÁFA:"

 #. module: sale
-#: code:addons/sale/sale.py:449
+#: code:addons/sale/sale.py:444
 #, python-format
 msgid "Customer Invoices"
 msgstr "Kimenő számlák"
@ -1546,7 +1546,7 @@ msgid "Sales"
 msgstr "Értékesítés"

 #. module: sale
-#: code:addons/sale/sale.py:309
+#: code:addons/sale/sale.py:308
 #, python-format
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
@ -1591,7 +1591,8 @@ msgid "Invoice address :"
 msgstr "Számlázási cím:"

 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
 #: model:process.node,name:sale.process_node_invoice0
 #: view:sale.order:0
 #, python-format
@ -1678,7 +1679,7 @@ msgid "Shipping address :"
 msgstr "Szállítási cím:"

 #. module: sale
-#: code:addons/sale/sale.py:510
+#: code:addons/sale/sale.py:505
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@ -2196,8 +2197,9 @@ msgid "Manual In Progress"
 msgstr "Manuális vezérléssel folyamatban"

 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:110
-#: code:addons/sale/wizard/sale_make_invoice.py:43
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
 #, python-format
 msgid "Warning!"
 msgstr "Figyelem!"
@ -2466,9 +2468,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Compute"
 #~ msgstr "Számítás"

-#~ msgid "Partial Delivery"
-#~ msgstr "Részleges kiszállítás"
-
 #~ msgid "UoM"
 #~ msgstr "ME"

@ -2779,9 +2778,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Előzetes számla megnyitása"

-#~ msgid "Sales Management"
-#~ msgstr "Értékesítési menedzsment"
-
 #~ msgid "Deliver"
 #~ msgstr "Szállítás"

@ -2792,9 +2788,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Sale Order Line"
 #~ msgstr "Rendelési tétel"

-#~ msgid "Cancel Assignation"
-#~ msgstr "Számla sztornó"
-
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Számla a csomagolási listából"

@ -2850,9 +2843,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Related invoices"
 #~ msgstr "Kapcsolódó számlák"

-#~ msgid "Payment Before Delivery"
-#~ msgstr "Fizetés szállítás előtt"
-
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@ -2877,6 +2867,9 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Sale Order line"
 #~ msgstr "Rendelési sor"

+#~ msgid "Payment Before Delivery"
+#~ msgstr "Szállítás előtti fizetés"
+
 #~ msgid "All at Once"
 #~ msgstr "Egyszerre"

@ -2892,9 +2885,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Notes"
 #~ msgstr "Megjegyzések"

-#~ msgid "Lines to Invoice"
-#~ msgstr "Számla sorai"
-
 #~ msgid "All Quotations"
 #~ msgstr "Összes árajánlat"

@ -2922,9 +2912,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Picking List"
 #~ msgstr "Kiszedési lista"

-#~ msgid "Picking List & Delivery Order"
-#~ msgstr "Kiszedési lista és Szállítás megrendelése"
-
 #~ msgid "Invoicing"
 #~ msgstr "Számlázás"

@ -2950,18 +2937,21 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Shipped Qty"
 #~ msgstr "Szállított mennyiség"

-#~ msgid "Shipping Default Policy"
-#~ msgstr "Alapértelmezett szállítási politika"
-
 #~ msgid "Close"
 #~ msgstr "Zárás"

+#~ msgid "Cancel Assignation"
+#~ msgstr "Hozzárendelés megszüntetése"
+
 #~ msgid "State"
 #~ msgstr "Állapot"

 #~ msgid "Configure"
 #~ msgstr "Beállítás"

+#~ msgid "Lines to Invoice"
+#~ msgstr "Kiszámlázandó sorok"
+
 #~ msgid "Order State"
 #~ msgstr "Megrendelés állapota"

@ -3675,3 +3665,15 @@ msgstr "A megrendelés megrendelési dátuma"

 #~ msgid "Invoice Policy"
 #~ msgstr "Számlázási szabály"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Rész-szállítmány"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Alapértelmezett számlázási szabály"
+
+#~ msgid "Sales Management"
+#~ msgstr "Értékesítés kezelés"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Kiválogatási lista & Kézbesítési bizonylat/szállító levél"
--- 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'}"/>