[MERGE] forward port branch 10.0 up to d53bb47

addons/account/tests/test_account_supplier_invoice.py

@@ -92,7 +92,7 @@ class TestAccountSupplierInvoice(AccountingTestCase):
         self.assertTrue((invoice.state == 'draft'), "Initially vendor bill state is Draft")
 
         #change the state of invoice to open by clicking Validate button
-        invoice.signal_workflow('invoice_open')
+        invoice.action_invoice_open()
 
         # Check if amount and corresponded base is correct for all tax scenarios given on a computational base
         # Keep in mind that tax amount can be changed by the user at any time before validating (based on the invoice and tax laws applicable)

addons/website/tests/test_views.py

@@ -141,7 +141,7 @@ class TestViewSaving(common.TransactionCase):
 
         # create a view with an xmlid, like the file import would
         with self.env.norecompute():
-            self.view_id = View.create(self.cr, self.uid, {
+            self.view_id = View.create({
                 'name': "Test View",
                 'type': 'qweb',
                 'arch': ET.tostring(self.arch, encoding='utf-8').decode('utf-8')
@@ -154,7 +154,7 @@ class TestViewSaving(common.TransactionCase):
         })
 
         # the xml_id of the view should not be flagged as 'noupdate'
-        self.assertEqual(View.browse(self.cr, self.uid, self.view_id).model_data_id, imd)
+        self.assertEqual(self.view_id.model_data_id, imd)
         self.assertFalse(imd.noupdate)
 
         replacement = ET.tostring(h.DIV(

doc/cla/individual/WhitleyStriber.md

@@ -0,0 +1,11 @@
+United States, 2016/10/14
+
+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,
+
+Whitley andrewtramutolo@gmail.com https://github.com/WhitleyStriber

doc/setup/deploy.rst

@@ -221,7 +221,7 @@ HTTPS
 =====
 
 Whether it's accessed via website/web client or the webservice, Odoo transmits
-authentication information in cleatext. This means a secure deployment of
+authentication information in cleartext. This means a secure deployment of
 Odoo must use HTTPS\ [#switching]_. SSL termination can be implemented via
 just about any SSL termination proxy, but requires the following setup: