[MERGE] forward port branch 11.0 up to 51225c9b9f2

21 files changed, 84 insertions, 42 deletions

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index b6f2fee7fe4..4c087e6b84e 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1231,6 +1231,21 @@ class AccountMoveLine(models.Model):
         action['domain'] = [('id', 'in', ids)]
         return action
 
+    @api.multi
+    def _payment_invoice_match(self):
+        '''
+        If a partial reconciliation involves payments and invoices
+        mark the invoices as paid by the payments
+        Specifically made for len(self) == 2
+        '''
+        if not self:
+            return
+        invoice_ids = self.mapped('invoice_id')
+        payment_ids = self.mapped('payment_id')
+
+        if payment_ids and invoice_ids:
+            payment_ids.write({'invoice_ids': [(4, inv.id, False) for inv in invoice_ids]})
+
 
 class AccountPartialReconcile(models.Model):
     _name = "account.partial.reconcile"
@@ -1530,6 +1545,7 @@ class AccountPartialReconcile(models.Model):
             aml.append(vals['credit_move_id'])
         # Get value of matched percentage from both move before reconciliating
         lines = self.env['account.move.line'].browse(aml)
+        lines._payment_invoice_match()
         if lines[0].account_id.internal_type in ('receivable', 'payable'):
             percentage_before_rec = lines._get_matched_percentage()
         # Reconcile
diff --git a/addons/account/models/company.py b/addons/account/models/company.py
index 0209ea5c849..ef148cc3495 100644
--- a/addons/account/models/company.py
+++ b/addons/account/models/company.py
@@ -122,12 +122,8 @@ Best Regards,'''))
 
     @api.model
     def _verify_fiscalyear_last_day(self, company_id, last_day, last_month):
-        company = self.browse(company_id)
-        last_day = last_day or (company and company.fiscalyear_last_day) or 31
-        last_month = last_month or (company and company.fiscalyear_last_month) or 12
-        current_year = datetime.now().year
-        last_day_of_month = calendar.monthrange(current_year, last_month)[1]
-        return last_day > last_day_of_month and last_day_of_month or last_day
+        # FIXME: Remove this method in master
+        return last_day
 
     @api.multi
     def compute_fiscalyear_dates(self, date):
diff --git a/addons/account/wizard/setup_wizards.py b/addons/account/wizard/setup_wizards.py
index 38d9d663847..84cef53d507 100644
--- a/addons/account/wizard/setup_wizards.py
+++ b/addons/account/wizard/setup_wizards.py
@@ -36,17 +36,6 @@ class FinancialYearOpeningWizard(models.TransientModel):
         """ Forces fiscal year setup state to 'undone'."""
         self.company_id.account_setup_fy_data_done = False
 
-    @api.multi
-    def write(self, vals):
-        if 'fiscalyear_last_day' in vals or 'fiscalyear_last_month' in vals:
-            for wizard in self:
-                company = wizard.company_id
-                vals['fiscalyear_last_day'] = company._verify_fiscalyear_last_day(
-                    company.id,
-                    vals.get('fiscalyear_last_day'),
-                    vals.get('fiscalyear_last_month'))
-        return super(FinancialYearOpeningWizard, self).write(vals)
-
 
 class OpeningAccountMoveWizard(models.TransientModel):
     _name = 'account.opening'
diff --git a/addons/anonymization/wizard/anonymize_wizard.py b/addons/anonymization/wizard/anonymize_wizard.py
index 4ba71b03455..7bf914ba742 100644
--- a/addons/anonymization/wizard/anonymize_wizard.py
+++ b/addons/anonymization/wizard/anonymize_wizard.py
@@ -127,6 +127,9 @@ class IrModelFieldsAnonymizeWizard(models.TransientModel):
     @api.multi
     def anonymize_database(self):
         """Sets the 'anonymized' state to defined fields"""
+        # pylint: disable=W0101
+        raise UserError("""The Odoo Migration Platform no longer accepts anonymized databases.\n
+            If you wish for your data to remain private during migration, please contact us at upgrade@odoo.com""")
         self.ensure_one()
 
         # create a new history record:
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index 68fe08bae7b..c3cd70392c3 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -701,6 +701,8 @@ class Lead(models.Model):
     @api.model
     def _get_duplicated_leads_by_emails(self, partner_id, email, include_lost=False):
         """ Search for opportunities that have the same partner and that arent done or cancelled """
+        if not email:
+            return []
         partner_match_domain = []
         for email in set(email_split(email) + [email]):
             partner_match_domain.append(('email_from', '=ilike', email))
diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index e08f37b135e..d0ca0a7c424 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -88,6 +88,9 @@ class SaleOrder(models.Model):
 
     def _create_delivery_line(self, carrier, price_unit):
         SaleOrderLine = self.env['sale.order.line']
+        if self.partner_id:
+            # set delivery detail in the customer language
+            carrier = carrier.with_context(lang=self.partner_id.lang)
 
         # Apply fiscal position
         taxes = carrier.product_id.taxes_id.filtered(lambda t: t.company_id.id == self.company_id.id)
diff --git a/addons/hr_payroll_account/models/hr_payroll_account.py b/addons/hr_payroll_account/models/hr_payroll_account.py
index da168912095..989d5f260f4 100644
--- a/addons/hr_payroll_account/models/hr_payroll_account.py
+++ b/addons/hr_payroll_account/models/hr_payroll_account.py
@@ -53,6 +53,7 @@ class HrPayslip(models.Model):
 
     @api.multi
     def action_payslip_done(self):
+        res = super(HrPayslip, self).action_payslip_done()
         precision = self.env['decimal.precision'].precision_get('Payroll')
 
         for slip in self:
@@ -138,7 +139,7 @@ class HrPayslip(models.Model):
             move = self.env['account.move'].create(move_dict)
             slip.write({'move_id': move.id, 'date': date})
             move.post()
-        return super(HrPayslip, self).action_payslip_done()
+        return res
 
 
 class HrSalaryRule(models.Model):
diff --git a/addons/hw_escpos/escpos/escpos.py b/addons/hw_escpos/escpos/escpos.py
index 7fc0e196b39..3573efb1d98 100644
--- a/addons/hw_escpos/escpos/escpos.py
+++ b/addons/hw_escpos/escpos/escpos.py
@@ -358,7 +358,7 @@ class Escpos:
             else:
                 self._raw(string)
        
-        raw += S_RASTER_N
+        raw += S_RASTER_N.encode('utf-8')
         buffer = "%02X%02X%02X%02X" % (int((size[0]/size[1])/8), 0, size[1], 0)
         raw += codecs.decode(buffer, 'hex')
         buffer = ""
diff --git a/addons/l10n_in/views/report_invoice.xml b/addons/l10n_in/views/report_invoice.xml
index 7fb7337becf..f20fee72efd 100644
--- a/addons/l10n_in/views/report_invoice.xml
+++ b/addons/l10n_in/views/report_invoice.xml
@@ -108,7 +108,14 @@
                         <td></td>
                         <td></td>
                         <td t-if="display_discount" groups="sale.group_discount_per_so_line"></td>
-                        <td t-att-colspan="o.company_id.country_id.code == 'IN' and 5 or 1"></td>
+                        <td t-if="len(o.tax_line_ids) > 0"></td>
+                        <td></td>
+                        <t t-if="o.company_id.country_id.code == 'IN'">
+                            <td t-if="is_cgst"></td>
+                            <td t-if="is_cgst"></td>
+                            <td t-if="is_igst"></td>
+                            <td t-if="is_cess"></td>
+                        </t>
                     </tr>
                 </tbody>
             </table>
diff --git a/addons/mass_mailing/models/mail_thread.py b/addons/mass_mailing/models/mail_thread.py
index 8e4ee298c67..f26aee7ff4a 100644
--- a/addons/mass_mailing/models/mail_thread.py
+++ b/addons/mass_mailing/models/mail_thread.py
@@ -35,7 +35,7 @@ class MailThread(models.AbstractModel):
         """ Override to update the parent mail statistics. The parent is found
         by using the References header of the incoming message and looking for
         matching message_id in mail.mail.statistics. """
-        if message.get('References'):
+        if message.get('References') and routes:
             message_ids = [x.strip() for x in decode_smtp_header(message['References']).split()]
             self.env['mail.mail.statistics'].set_opened(mail_message_ids=message_ids)
             self.env['mail.mail.statistics'].set_replied(mail_message_ids=message_ids)
diff --git a/addons/mass_mailing/models/mass_mailing_stats.py b/addons/mass_mailing/models/mass_mailing_stats.py
index 0a095943f99..8e48a4cb465 100644
--- a/addons/mass_mailing/models/mass_mailing_stats.py
+++ b/addons/mass_mailing/models/mass_mailing_stats.py
@@ -106,7 +106,7 @@ class MailMailStats(models.Model):
 
     def set_opened(self, mail_mail_ids=None, mail_message_ids=None):
         statistics = self._get_records(mail_mail_ids, mail_message_ids, [('opened', '=', False)])
-        statistics.write({'opened': fields.Datetime.now()})
+        statistics.write({'opened': fields.Datetime.now(), 'bounced': False})
         return statistics
 
     def set_clicked(self, mail_mail_ids=None, mail_message_ids=None):
@@ -120,6 +120,7 @@ class MailMailStats(models.Model):
         return statistics
 
     def set_bounced(self, mail_mail_ids=None, mail_message_ids=None):
-        statistics = self._get_records(mail_mail_ids, mail_message_ids, [('bounced', '=', False)])
+        statistics = self._get_records(
+            mail_mail_ids, mail_message_ids, [('bounced', '=', False), ('opened', '=', False)])
         statistics.write({'bounced': fields.Datetime.now()})
         return statistics
diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js
index 372e8ba233d..72aa70c88b6 100644
--- a/addons/payment/static/src/js/payment_form.js
+++ b/addons/payment/static/src/js/payment_form.js
@@ -134,7 +134,7 @@ odoo.define('payment.payment_form', function (require) {
                         self.displayError(
                             _t('Server Error'),
                             _t("We are not able to add your payment method at the moment.") +
-                               data.data.message
+                               message.data.message
                         );
                     });
                 }
@@ -179,7 +179,7 @@ odoo.define('payment.payment_form', function (require) {
                             self.displayError(
                                 _t('Server Error'),
                                 _t("We are not able to redirect you to the payment form. ") +
-                                   data.data.message
+                                   message.data.message
                             );
                         });
                     }
diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index f9ad010b155..25225bdc8f6 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -28,11 +28,12 @@ class AccountInvoice(models.Model):
         purchase_line_ids = self.invoice_line_ids.mapped('purchase_line_id')
         purchase_ids = self.invoice_line_ids.mapped('purchase_id').filtered(lambda r: r.order_line <= purchase_line_ids)
 
-        result['domain'] = {'purchase_id': [
-            ('invoice_status', '=', 'to invoice'),
-            ('partner_id', 'child_of', self.partner_id.id),
-            ('id', 'not in', purchase_ids.ids),
-            ]}
+        domain = [('invoice_status', '=', 'to invoice')]
+        if self.partner_id:
+            domain += [('partner_id', 'child_of', self.partner_id.id)]
+        if purchase_ids:
+            domain += [('id', 'not in', purchase_ids.ids)]
+        result['domain'] = {'purchase_id': domain}
         return result
 
     def _prepare_invoice_line_from_po_line(self, line):
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 2dc109f5211..a23b478a61f 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -395,10 +395,11 @@ class PurchaseOrder(models.Model):
             if order.state in ('draft', 'sent', 'to approve'):
                 for order_line in order.order_line:
                     if order_line.move_dest_ids:
-                        siblings_states = (order_line.move_dest_ids.mapped('move_orig_ids')).mapped('state')
+                        move_dest_ids = order_line.move_dest_ids.filtered(lambda m: m.state not in ('done', 'cancel'))
+                        siblings_states = (move_dest_ids.mapped('move_orig_ids')).mapped('state')
                         if all(state in ('done', 'cancel') for state in siblings_states):
-                            order_line.move_dest_ids.write({'procure_method': 'make_to_stock'})
-                            order_line.move_dest_ids._recompute_state()
+                            move_dest_ids.write({'procure_method': 'make_to_stock'})
+                            move_dest_ids._recompute_state()
 
             for pick in order.picking_ids.filtered(lambda r: r.state != 'cancel'):
                 pick.action_cancel()
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index bc9fcd8bd76..8fc1e330335 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -666,6 +666,12 @@ class SaleOrder(models.Model):
                         'target': 'self',
                         'res_id': self.id,
                     }
+        else:
+            action = self.env.ref('sale.action_quotations', False)
+            if action:
+                result = action.read()[0]
+                result['res_id'] = self.id
+                return result
         return super(SaleOrder, self).get_access_action(access_uid)
 
     def get_mail_url(self):
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 03516c551bf..9c5bc7b6d89 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -715,8 +715,6 @@ class Picking(models.Model):
                 if product and product.tracking != 'none':
                     if not line.lot_name and not line.lot_id:
                         raise UserError(_('You need to supply a Lot/Serial number for product %s.') % product.display_name)
-                    elif line.qty_done == 0:
-                        raise UserError(_('You cannot validate a transfer if you have not processed any quantity for %s.') % product.display_name)
 
         if no_quantities_done:
             view = self.env.ref('stock.view_immediate_transfer')
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index 32129bde80a..ceaf2ae8ea0 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -3158,7 +3158,7 @@ class StockMove(TransactionCase):
 
     def test_immediate_validate_4(self):
         """ In a picking with a single available tracked by lot move, clicking on validate without
-        filling any quantities should open an UserError.
+        filling any quantities should pop up the immediate transfer wizard.
         """
         partner = self.env['res.partner'].create({'name': 'Jean'})
         lot1 = self.env['stock.production.lot'].create({
@@ -3184,12 +3184,11 @@ class StockMove(TransactionCase):
         })
         picking.action_confirm()
         picking.action_assign()
-        # No quantites/lot filled, it should raise.
-        with self.assertRaises(UserError):
-            picking.button_validate()
-        picking.move_lines.move_line_ids[0].qty_done = 5.0
-        # All the information are present (lots and quantities), the wizard won't be opened.
-        picking.button_validate()
+        # No quantites filled, immediate transfer wizard should pop up.
+        immediate_trans_wiz_dict = picking.button_validate()
+        self.assertEqual(immediate_trans_wiz_dict.get('res_model'), 'stock.immediate.transfer')
+        immediate_trans_wiz = self.env[immediate_trans_wiz_dict['res_model']].browse(immediate_trans_wiz_dict['res_id'])
+        immediate_trans_wiz.process()
 
         self.assertEqual(picking.move_lines.quantity_done, 5.0)
         # Check move_lines data
diff --git a/addons/stock_landed_costs/__manifest__.py b/addons/stock_landed_costs/__manifest__.py
index e181f6d9bb4..32869aa169d 100644
--- a/addons/stock_landed_costs/__manifest__.py
+++ b/addons/stock_landed_costs/__manifest__.py
@@ -18,6 +18,7 @@ This module allows you to easily add extra costs on pickings and decide the spli
     ],
     'data': [
         'security/ir.model.access.csv',
+        'security/stock_landed_cost_security.xml',
         'data/stock_landed_cost_data.xml',
         'views/product_views.xml',
         'views/stock_landed_cost_views.xml',
diff --git a/addons/stock_landed_costs/models/stock_landed_cost.py b/addons/stock_landed_costs/models/stock_landed_cost.py
index 533d3b15e04..2137b111a9e 100644
--- a/addons/stock_landed_costs/models/stock_landed_cost.py
+++ b/addons/stock_landed_costs/models/stock_landed_cost.py
@@ -51,6 +51,8 @@ class LandedCost(models.Model):
     account_journal_id = fields.Many2one(
         'account.journal', 'Account Journal',
         required=True, states={'done': [('readonly', True)]})
+    company_id = fields.Many2one('res.company', string="Company",
+        related='account_journal_id.company_id')
 
     @api.one
     @api.depends('cost_lines.price_unit')
diff --git a/addons/stock_landed_costs/security/stock_landed_cost_security.xml b/addons/stock_landed_costs/security/stock_landed_cost_security.xml
new file mode 100644
index 00000000000..1182f9c687a
--- /dev/null
+++ b/addons/stock_landed_costs/security/stock_landed_cost_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="0">
+
+    <record model="ir.rule" id="stock_landed_cost_rule">
+        <field name="name">stock_landed_cost multi-company</field>
+        <field name="model_id" search="[('model','=','stock.landed.cost')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+</data>
+</odoo>
\ No newline at end of file
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index de694e9b9a7..00e02e6e032 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -949,6 +949,9 @@ var VideoWidget = MediaWidget.extend({
             return {errorCode: 1};
         }
 
+        if (ytMatch) {
+            $video.attr('src', $video.attr('src') + '&rel=0');
+        }
         if (options.loop && (ytMatch || vimMatch)) {
             $video.attr('src', $video.attr('src') + '&loop=1');
         }