[MERGE] forward port of branch 8.0 up to d3e9bde

addons/account/account_invoice.py

@@ -1547,7 +1547,8 @@ def amount_change(self, amount, currency_id=False, company_id=False, date_invoic
             currency = self.env['res.currency'].browse(currency_id)
             currency = currency.with_context(date=date_invoice or fields.Date.context_today(self))
             amount = currency.compute(amount, company.currency_id, round=False)
-        return {'value': {'tax_amount': amount}}
+        tax_sign = (self.tax_amount / self.amount) if self.amount else 1
+        return {'value': {'tax_amount': amount * tax_sign}}
 
     @api.v8
     def compute(self, invoice):

addons/account/account_view.xml

@@ -1210,8 +1210,8 @@
             <field eval="1" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" editable="top">
-                    <field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
-                    <field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
+                    <field name="journal_id" options='{"no_open":True}'/>
+                    <field name="period_id" options='{"no_open":True}'/>
                     <field name="date"/>
                     <field name="name"/>
                     <field name="ref"/>

addons/account_cancel/__init__.py

@@ -18,3 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
+import models

addons/account_cancel/account_cancel_view.xml

@@ -34,6 +34,17 @@
             </field>
         </record>
 
+        <record id="bank_statement_draft_form_inherit" model="ir.ui.view">
+            <field name="name">bank.statement.draft.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='button_cancel']" position="after">
+                    <button name="button_draft" states="confirm" string="Reset to New" type="object"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="bank_statement_cancel_form_inherit" model="ir.ui.view">
             <field name="name">bank.statement.cancel.form.inherit</field>
             <field name="model">account.bank.statement</field>

addons/account_cancel/models/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import account_bank_statement

addons/account_cancel/models/account_bank_statement.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from openerp import models, api, _
+from openerp.exceptions import Warning
+
+
+class BankStatement(models.Model):
+    _inherit = 'account.bank.statement'
+
+    @api.multi
+    def button_draft(self):
+        self.state = 'draft'
+
+class BankStatementLine(models.Model):
+    _inherit = 'account.bank.statement.line'
+
+    @api.multi
+    def cancel(self):
+        for line in self:
+            if line.statement_id.state == 'confirm':
+                raise Warning(_("Please set the bank statement to New before canceling."))
+        return super(BankStatementLine, self).cancel()

addons/analytic_user_function/analytic_user_function.py

@@ -116,7 +116,7 @@ def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amo
             res ['value']['general_account_id']= a
         return res
 
-    def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0):
+    def on_change_user_id(self, cr, uid, ids, user_id, account_id=False, unit_amount=0):
         res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
 
         if account_id:

addons/board/board.py

@@ -66,7 +66,7 @@ def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None
 
         res = {}
         res = super(board_board, self).fields_view_get(cr, user, view_id, view_type,
-                                                       context, toolbar=toolbar, submenu=submenu)
+                                                       context=context, toolbar=toolbar, submenu=submenu)
 
         CustView = self.pool.get('ir.ui.view.custom')
         vids = CustView.search(cr, user, [('user_id', '=', user), ('ref_id', '=', view_id)], context=context)

addons/crm_partner_assign/crm_partner_assign.py

@@ -205,7 +205,8 @@ def search_geo_partner(self, cr, uid, ids, context=None):
                     # warning: point() type takes (longitude, latitude) as parameters in this order!
                     cr.execute("""SELECT id, distance
                                   FROM  (select id, (point(partner_longitude, partner_latitude) <-> point(%s,%s)) AS distance FROM res_partner
-                                  WHERE partner_longitude is not null
+                                  WHERE active
+                                        AND partner_longitude is not null
                                         AND partner_latitude is not null
                                         AND partner_weight > 0) AS d
                                   ORDER BY distance LIMIT 1""", (longitude, latitude))

addons/delivery/stock.py

@@ -82,7 +82,7 @@ def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None
         """
         carrier_obj = self.pool.get('delivery.carrier')
         grid_obj = self.pool.get('delivery.grid')
-        fpos_obj = self.pool['account.fiscal.position']
+        currency_obj = self.pool.get('res.currency')
         if not picking.carrier_id or \
             any(inv_line.product_id.id == picking.carrier_id.product_id.id
                 for inv_line in invoice.invoice_line):
@@ -95,6 +95,9 @@ def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None
         price = grid_obj.get_price_from_picking(cr, uid, grid_id,
                 invoice.amount_untaxed, picking.weight, picking.volume,
                 quantity, context=context)
+        if invoice.company_id.currency_id.id != invoice.currency_id.id:
+            price = currency_obj.compute(cr, uid, invoice.company_id.currency_id.id, invoice.currency_id.id,
+                price, context=dict(context or {}, date=invoice.date_invoice))
         account_id = picking.carrier_id.product_id.property_account_income.id
         if not account_id:
             account_id = picking.carrier_id.product_id.categ_id\

addons/fetchmail/fetchmail.py

@@ -42,6 +42,7 @@
 
 _logger = logging.getLogger(__name__)
 MAX_POP_MESSAGES = 50
+MAIL_TIMEOUT = 60
 
 # Workaround for Python 2.7.8 bug https://bugs.python.org/issue23906
 poplib._MAXLINE = 65536
@@ -155,6 +156,8 @@ def connect(self, cr, uid, server_id, context=None):
             #connection.user("recent:"+server.user)
             connection.user(server.user)
             connection.pass_(server.password)
+        # Add timeout on socket
+        connection.sock.settimeout(MAIL_TIMEOUT)
         return connection
 
     def button_confirm_login(self, cr, uid, ids, context=None):

addons/google_account/google_account.py

@@ -163,13 +163,13 @@ def _do_request(self, cr, uid, uri, params={}, headers={}, type='POST', preuri="
             except:
                 pass
         except urllib2.HTTPError, e:
-            if e.code in (400, 401, 410):
-                raise e
-            elif e.code in (204, 404):
+            if e.code in (204, 404):
                 status = e.code
                 response = ""
             else:
                 _logger.exception("Bad google request : %s !" % e.read())
+                if e.code in (400, 401, 410):
+                    raise e
                 raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong with your request to google"), context=context)
         return (status, response, ask_time)
 

addons/google_calendar/google_calendar.py

@@ -216,8 +216,10 @@ def generate_data(self, cr, uid, event, isCreating=False, context=None):
             vstype = 'date'
         attendee_list = []
         for attendee in event.attendee_ids:
+            email = tools.email_split(attendee.email)
+            email = email[0] if email else 'NoEmail@mail.com'
             attendee_list.append({
-                'email': attendee.email or 'NoEmail@mail.com',
+                'email': email,
                 'displayName': attendee.partner_id.name,
                 'responseStatus': attendee.state or 'needsAction',
             })

addons/hr_timesheet_invoice/hr_timesheet_invoice.py

@@ -221,17 +221,17 @@ def _prepare_cost_invoice_line(self, cr, uid, invoice_id, product_id, uom, user_
             if factor.customer_name:
                 factor_name += ' - ' + factor.customer_name
 
-                general_account = product.property_account_income or product.categ_id.property_account_income_categ
-                if not general_account:
-                    raise UserError(_("Configuration Error!") + '\n' + _("Please define income account for product '%s'.") % product.name)
-                taxes = product.taxes_id or general_account.tax_ids
-                tax = self.pool['account.fiscal.position'].map_tax(cr, uid, account.partner_id.property_account_position, taxes)
-                curr_invoice_line.update({
-                    'invoice_line_tax_id': [(6, 0, tax)],
-                    'name': factor_name,
-                    'invoice_line_tax_id': [(6, 0, tax)],
-                    'account_id': general_account.id,
-                })
+            general_account = product.property_account_income or product.categ_id.property_account_income_categ
+            if not general_account:
+                raise UserError(_("Configuration Error!") + '\n' + _("Please define income account for product '%s'.") % product.name)
+            taxes = product.taxes_id or general_account.tax_ids
+            tax = self.pool['account.fiscal.position'].map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+            curr_invoice_line.update({
+                'invoice_line_tax_id': [(6, 0, tax)],
+                'name': factor_name,
+                'invoice_line_tax_id': [(6, 0, tax)],
+                'account_id': general_account.id,
+            })
 
             note = []
             for line in analytic_lines:

addons/l10n_be/account_tax_template.xml

@@ -6,7 +6,7 @@
         <record id="attn_VAT-OUT-21-S" model="account.tax.template">
             <field name="sequence">10</field>
             <field name="description">VAT-OUT-21-S</field>
-            <field name="name">VAT 21% - Services</field>
+            <field name="name">TVA 21% - Services</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -27,7 +27,7 @@
         <record id="attn_VAT-OUT-21-L" model="account.tax.template">
             <field name="sequence">11</field>
             <field name="description">VAT-OUT-21-L</field>
-            <field name="name">VAT 21%</field>
+            <field name="name">TVA 21%</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -48,7 +48,7 @@
         <record id="attn_VAT-OUT-12-S" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="description">VAT-OUT-12-S</field>
-            <field name="name">VAT 12% - Services</field>
+            <field name="name">TVA 12% - Services</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -69,7 +69,7 @@
         <record id="attn_VAT-OUT-12-L" model="account.tax.template">
             <field name="sequence">21</field>
             <field name="description">VAT-OUT-12-L</field>
-            <field name="name">VAT 12%</field>
+            <field name="name">TVA 12%</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -90,7 +90,7 @@
         <record id="attn_VAT-OUT-06-S" model="account.tax.template">
             <field name="sequence">30</field>
             <field name="description">VAT-OUT-06-S</field>
-            <field name="name">VAT 6% - Services</field>
+            <field name="name">TVA 6% - Services</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -111,7 +111,7 @@
         <record id="attn_VAT-OUT-06-L" model="account.tax.template">
             <field name="sequence">31</field>
             <field name="description">VAT-OUT-06-L</field>
-            <field name="name">VAT 6%</field>
+            <field name="name">TVA 6%</field>
             <field name="account_collected_id" ref="a451054"/>
             <field name="account_paid_id" ref="a451054"/>
             <field name="price_include" eval="0"/>
@@ -132,7 +132,7 @@
         <record id="attn_VAT-OUT-00-S" model="account.tax.template">
             <field name="sequence">40</field>
             <field name="description">VAT-OUT-00-S</field>
-            <field name="name">VAT 0% - Services</field>
+            <field name="name">TVA 0% - Services</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -149,7 +149,7 @@
         <record id="attn_VAT-OUT-00-L" model="account.tax.template">
             <field name="sequence">41</field>
             <field name="description">VAT-OUT-00-L</field>
-            <field name="name">VAT 0%</field>
+            <field name="name">TVA 0%</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -166,7 +166,7 @@
         <record id="attn_VAT-OUT-00-CC" model="account.tax.template">
             <field name="sequence">50</field>
             <field name="description">VAT-OUT-00-CC</field>
-            <field name="name">VAT 0% Cocontractant</field>
+            <field name="name">TVA 0% Cocontractant</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -183,7 +183,7 @@
         <record id="attn_VAT-OUT-00-EU-S" model="account.tax.template">
             <field name="sequence">60</field>
             <field name="description">VAT-OUT-00-EU-S</field>
-            <field name="name">Services EU</field>
+            <field name="name">TVA services EU</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -200,7 +200,7 @@
         <record id="attn_VAT-OUT-00-EU-L" model="account.tax.template">
             <field name="sequence">61</field>
             <field name="description">VAT-OUT-00-EU-L</field>
-            <field name="name">Marchandises EU (Code L)</field>
+            <field name="name">TVA Marchandises EU (Code L)</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -217,7 +217,7 @@
         <record id="attn_VAT-OUT-00-EU-T" model="account.tax.template">
             <field name="sequence">62</field>
             <field name="description">VAT-OUT-00-EU-T</field>
-            <field name="name">Marchandises EU (Code T)</field>
+            <field name="name">TVA marchandises EU (Code T)</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -234,7 +234,7 @@
         <record id="attn_VAT-OUT-00-ROW" model="account.tax.template">
             <field name="sequence">70</field>
             <field name="description">VAT-OUT-00-ROW</field>
-            <field name="name">Export hors EU</field>
+            <field name="name">TVA export hors EU</field>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>
             <field name="type">percent</field>
@@ -1981,7 +1981,7 @@
         <record id="attn_VAT-IN-V82-CAR-INC" model="account.tax.template">
             <field name="sequence">710</field>
             <field name="description">VAT-IN-V82-CAR-INC</field>
-            <field name="name">TVA Entrant - Frais de voiture - VAT 50% Non Deductible (Price Incl.)</field>
+            <field name="name">TVA entrante - Frais de voiture - TVA 50% Non Deductible (Price Incl.)</field>
             <field name="price_include" eval="1"/>
             <field name="amount">1</field>
             <field name="type">percent</field>
@@ -1996,7 +1996,7 @@
         <record id="attn_VAT-IN-V82-CAR-INC-C1" model="account.tax.template">
             <field name="sequence">711</field>
             <field name="description">VAT-IN-V82-CAR-INC-C1</field>
-            <field name="name">Frais de voiture - VAT 50% Deductible</field>
+            <field name="name">Frais de voiture - TVA 50% Deductible</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-INC"/>
             <field name="account_collected_id" ref="a411059"/>
             <field name="account_paid_id" ref="a411059"/>
@@ -2018,7 +2018,7 @@
         <record id="attn_VAT-IN-V82-CAR-INC-C2" model="account.tax.template">
             <field name="sequence">712</field>
             <field name="description">VAT-IN-V82-CAR-INC-C2</field>
-            <field name="name">Frais de voiture - Montant de la note de crédit</field>
+            <field name="name">TVA frais de voiture - Montant de la note de crédit</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-INC"/>
             <field name="price_include" eval="1"/>
             <field name="amount">0</field>
@@ -2035,7 +2035,7 @@
         <record id="attn_VAT-IN-V82-CAR-EXC" model="account.tax.template">
             <field name="sequence">720</field>
             <field name="description">VAT-IN-V82-CAR-EXC</field>
-            <field name="name">TVA Entrant - Frais de voiture - VAT 50% Non Deductible (Price Excl.)</field>
+            <field name="name">TVA entrante - Frais de voiture - TVA 50% Non Déductible (Prix Excl.)</field>
             <field name="price_include" eval="0"/>
             <field name="amount">1</field>
             <field name="type">percent</field>
@@ -2050,7 +2050,7 @@
         <record id="attn_VAT-IN-V82-CAR-EXC-C1" model="account.tax.template">
             <field name="sequence">721</field>
             <field name="description">VAT-IN-V82-CAR-EXC-C1</field>
-            <field name="name">Frais de voiture - VAT 50% Non Deductible</field>
+            <field name="name">Frais de voiture - TVA 50% Non Deductible</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-EXC"/>
             <field name="account_collected_id" ref="a64012"/>
             <field name="account_paid_id" ref="a64012"/>
@@ -2072,7 +2072,7 @@
         <record id="attn_VAT-IN-V82-CAR-EXC-C2" model="account.tax.template">
             <field name="sequence">722</field>
             <field name="description">VAT-IN-V82-CAR-EXC-C2</field>
-            <field name="name">Frais de voiture - VAT 50% Deductible (Price Excl.)</field>
+            <field name="name">Frais de voiture - TVA 50% Deductible (Prix Excl.)</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-EXC"/>
             <field name="account_collected_id" ref="a411059"/>
             <field name="account_paid_id" ref="a411059"/>
@@ -2092,7 +2092,7 @@
         <record id="attn_VAT-IN-V82-CAR-EXC-C3" model="account.tax.template">
             <field name="sequence">723</field>
             <field name="description">VAT-IN-V82-CAR-EXC-C3</field>
-            <field name="name">Frais de voiture - Montant de la note de crédit (Price Excl.)</field>
+            <field name="name">TVA frais de voiture - Montant de la note de crédit (Prix Excl.)</field>
             <field name="parent_id" ref="attn_VAT-IN-V82-CAR-EXC"/>
             <field name="price_include" eval="0"/>
             <field name="amount">0</field>