From c02f9e433d07f427c09c4d554a1d1fe63a73ac8a Mon Sep 17 00:00:00 2001
From: Borni DHIFI <dhifi.borni@gmail.com>
Date: Tue, 22 Aug 2017 17:27:58 +0200
Subject: [PATCH 1/7] [CLA] signature for Borni DHIFI

Closes #18989
---
 doc/cla/individual/borni-dhifi.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/cla/individual/borni-dhifi.md

diff --git a/doc/cla/individual/borni-dhifi.md b/doc/cla/individual/borni-dhifi.md
new file mode 100644
index 00000000000..429f208f918
--- /dev/null
+++ b/doc/cla/individual/borni-dhifi.md
@@ -0,0 +1,9 @@
+Tunisia, 2017-08-22
+
+I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Borni Dhifi dhifi.borni@gmail.com https://github.com/borni-dhifi

From cda1bc55afbf5486dd831b4ca6e10b942eebf6c2 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Aug 2017 18:25:45 +0200
Subject: [PATCH 2/7] [FIX] product_extended: traceback on `bom_count`

Complement of commit 543f75f46e47e7064492270e515875a6cc156b3c

opw-766678
---
 addons/product_extended/views/product_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/product_extended/views/product_views.xml b/addons/product_extended/views/product_views.xml
index 2867a33f868..4e065e19604 100644
--- a/addons/product_extended/views/product_views.xml
+++ b/addons/product_extended/views/product_views.xml
@@ -23,6 +23,7 @@
             <field name="model">product.product</field>
             <field name="priority">4</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="groups_id" eval="[(4, ref('mrp.group_mrp_user'))]"/>
             <field name="arch" type="xml">
                <div name="standard_price_uom" position="after">
                     <button name="compute_price"

From 00125215f78d630e369927e6410ecdd5d164b94b Mon Sep 17 00:00:00 2001
From: Benjamin Willig <benjamin.willig@acsone.eu>
Date: Wed, 16 Aug 2017 13:13:58 +0200
Subject: [PATCH 3/7] [FIX] Allow inheritance to change writeoff lines values

Allow inheritance to change writeoff lines values in function _create_writeoff

opw:766422
---
 addons/account/models/account_move.py | 46 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 816eaafb382..15c69fe3d53 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -946,26 +946,10 @@ class AccountMoveLine(models.Model):
             vals['amount_currency'] = sign * abs(sum([r.amount_residual_currency for r in self]))
 
         # Writeoff line in the account of self
-        first_line_dict = vals.copy()
-        first_line_dict['account_id'] = self[0].account_id.id
-        if 'analytic_account_id' in first_line_dict:
-            del first_line_dict['analytic_account_id']
-        if 'tax_ids' in first_line_dict:
-            tax_ids = []
-            #vals['tax_ids'] is a list of commands [[4, tax_id, None], ...]
-            for tax_id in vals['tax_ids']:
-                tax_ids.append(tax_id[1])
-            amount = first_line_dict['credit'] - first_line_dict['debit']
-            amount_tax = self.env['account.tax'].browse(tax_ids).compute_all(amount)['total_included']
-            first_line_dict['credit'] = amount_tax > 0 and amount_tax or 0.0
-            first_line_dict['debit'] = amount_tax < 0 and abs(amount_tax) or 0.0
-            del first_line_dict['tax_ids']
+        first_line_dict = self._prepare_writeoff_first_line_values(vals)
 
         # Writeoff line in specified writeoff account
-        second_line_dict = vals.copy()
-        second_line_dict['debit'], second_line_dict['credit'] = second_line_dict['credit'], second_line_dict['debit']
-        if 'amount_currency' in vals:
-            second_line_dict['amount_currency'] = -second_line_dict['amount_currency']
+        second_line_dict = self._prepare_writeoff_second_line_values(vals)
 
         # Create the move
         writeoff_move = self.env['account.move'].with_context(apply_taxes=True).create({
@@ -979,6 +963,32 @@ class AccountMoveLine(models.Model):
         # Return the writeoff move.line which is to be reconciled
         return writeoff_move.line_ids.filtered(lambda r: r.account_id == self[0].account_id)
 
+    @api.multi
+    def _prepare_writeoff_first_line_values(self, values):
+        line_values = values.copy()
+        line_values['account_id'] = self[0].account_id.id
+        if 'analytic_account_id' in line_values:
+            del line_values['analytic_account_id']
+        if 'tax_ids' in line_values:
+            tax_ids = []
+            # vals['tax_ids'] is a list of commands [[4, tax_id, None], ...]
+            for tax_id in values['tax_ids']:
+                tax_ids.append(tax_id[1])
+            amount = line_values['credit'] - line_values['debit']
+            amount_tax = self.env['account.tax'].browse(tax_ids).compute_all(amount)['total_included']
+            line_values['credit'] = amount_tax > 0 and amount_tax or 0.0
+            line_values['debit'] = amount_tax < 0 and abs(amount_tax) or 0.0
+            del line_values['tax_ids']
+        return line_values
+
+    @api.multi
+    def _prepare_writeoff_second_line_values(self, values):
+        line_values = values.copy()
+        line_values['debit'], line_values['credit'] = line_values['credit'], line_values['debit']
+        if 'amount_currency' in values:
+            line_values['amount_currency'] = -line_values['amount_currency']
+        return line_values
+
     @api.model
     def compute_full_after_batch_reconcile(self):
         """ After running the manual reconciliation wizard and making full reconciliation, we need to run this method to create

From b3590bc58e7536f61554cca310fac361c9e48a8a Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Aug 2017 10:51:27 +0200
Subject: [PATCH 4/7] [FIX] mrp: change lots in produce

- Create Products A and B, tracked by unique serial number.
- Receive some quantity of B.
- Create a BOM for A which uses 1 unit of B.
- Create a MO for 2 units of A, save and check availability.
- Click on the 'Produce' button.
- Change the suggested lot (choose a new one or create), then click on
  the '+' button.

When the wizard is reloaded, the lot chosen is lost.

We reach an exception in the framework: when clicking on the '+' button,
no `create` is performed on the transient model `mrp.product.produce`,
therefore the values are not saved.

Since this use case is an exception and is likely to lead to errors, we
remove the button.

opw-761044
---
 addons/mrp/wizard/mrp_product_produce_views.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/mrp/wizard/mrp_product_produce_views.xml b/addons/mrp/wizard/mrp_product_produce_views.xml
index 805d05b7549..c3df10ddbbe 100644
--- a/addons/mrp/wizard/mrp_product_produce_views.xml
+++ b/addons/mrp/wizard/mrp_product_produce_views.xml
@@ -29,8 +29,6 @@
                                 <field name="quantity_done"/>
                                 <field name="lot_id" context="{'default_product_id': product_id}"/>
                                 <field name="move_id" invisible="1"/>
-                                <button name="do_minus" type="object" icon="fa-minus-square" attrs="{'invisible': [('quantity_done', '&lt;=', 0.99)]}" invisible="context.get('state_done')"/>
-                                <button name="do_plus" type="object" icon="fa-plus-square" attrs="{'invisible': [('plus_visible', '=', False)]}" invisible="context.get('state_done')"/>
                             </tree>
                         </field>
                     </group>

From 3b232b9eff4ebc935330ada2fe06400b559052e5 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Aug 2017 13:52:10 +0200
Subject: [PATCH 5/7] [FIX] link_tracker: do not track 'tel:' or 'sms:' links

- Create a mass mailing including a 'tel' or 'sms' link, e.g.
  `<a href="tel:555-000-0000">555-000-0000</a>`
- When sent, the link is converted to a tracked linked (`http://...`)

We do not want to convert these links, they should be handled by the
browser directly.

opw-765885
---
 addons/link_tracker/models/link_tracker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py
index 89ab91ef48b..2159ffdffe2 100644
--- a/addons/link_tracker/models/link_tracker.py
+++ b/addons/link_tracker/models/link_tracker.py
@@ -15,7 +15,7 @@ from werkzeug import url_encode, unescape
 from odoo import models, fields, api, _
 from odoo.tools import ustr
 
-URL_REGEX = r'(\bhref=[\'"](?!mailto:)([^\'"]+)[\'"])'
+URL_REGEX = r'(\bhref=[\'"](?!mailto:|tel:|sms:)([^\'"]+)[\'"])'
 
 def VALIDATE_URL(url):
     if urlparse(url).scheme not in ('http', 'https', 'ftp', 'ftps'):

From 857778fa94bfc70ea7684d37297ca76e40b87262 Mon Sep 17 00:00:00 2001
From: amoyaux <arm@odoo.com>
Date: Wed, 23 Aug 2017 10:46:24 +0200
Subject: [PATCH 6/7] [FIX] stock: move entire pack with multiple quants

There was an error message when trying to move an entire
pack that contains multiple quants saying that every component
in the pack should be in the same location. (it the case with the
bug)

It happens because after action_done only one quant of the package is moved
to the new location and other quant still in the old location. Thus the
check fail. Also the extra move for remaining was not created.

This commit changes the get_remaining_prod_quantities on pack operation
that had a migration error between old/new api. This change returns the
correct remaining quantities and thus the extra move is created and all
quants for the pack are moved to the new location.
---
 addons/stock/models/stock_pack_operation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/models/stock_pack_operation.py b/addons/stock/models/stock_pack_operation.py
index 1c7251e7a80..8cdf5d5ce09 100644
--- a/addons/stock/models/stock_pack_operation.py
+++ b/addons/stock/models/stock_pack_operation.py
@@ -90,7 +90,7 @@ class PackOperation(models.Model):
         res = self.package_id._get_all_products_quantities()
         # reduce by the quantities linked to a move
         for record in self.linked_move_operation_ids:
-            if record.move_id.product_id.id not in res:
+            if record.move_id.product_id not in res:
                 res[record.move_id.product_id] = 0
             res[record.move_id.product_id] -= record.qty
         return res

From 420e433fa3a6b671868fa578e6006dd215570706 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 23 Aug 2017 18:07:38 +0200
Subject: [PATCH 7/7] Revert "[FIX] website_sale: Avoid compute tax for every
 company"

This reverts commit 04cddc447b89906ed3001c89993a90e934b05adf.

Public user can't read taxes (map_tax() only play with ids)
---
 addons/website_sale/models/product.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index 5d372588088..d3e1c6b893a 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -190,9 +190,7 @@ class Product(models.Model):
     def _website_price(self):
         qty = self._context.get('quantity', 1.0)
         partner = self.env.user.partner_id
-        current_website = self.env['website'].get_current_website()
-        pricelist = current_website.get_current_pricelist()
-        company_id = current_website.company_id
+        pricelist = self.env['website'].get_current_website().get_current_pricelist()
 
         context = dict(self._context, pricelist=pricelist.id, partner=partner)
         self2 = self.with_context(context) if self._context != context else self
@@ -200,7 +198,7 @@ class Product(models.Model):
         ret = self.env.user.has_group('sale.group_show_price_subtotal') and 'total_excluded' or 'total_included'
 
         for p, p2 in zip(self, self2):
-            taxes = partner.property_account_position_id.map_tax(p.taxes_id.filtered(lambda x: x.company_id == company_id))
+            taxes = partner.property_account_position_id.map_tax(p.taxes_id)
             p.website_price = taxes.compute_all(p2.price, pricelist.currency_id, quantity=qty, product=p2, partner=partner)[ret]
             p.website_public_price = taxes.compute_all(p2.lst_price, quantity=qty, product=p2, partner=partner)[ret]