Fix code that clashes with the new API in several places, and merge from odoo/master

README.md

@@ -1,73 +1,52 @@
-About Odoo
-==========
+Odoo
+----
 
-Odoo is a suite of open source Business apps. More info at http://www.odoo.com
+Odoo is a suite of web based open source business apps.  More info at http://www.odoo.com
 
-Installation
-============
+The easiest way to play with it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, use the "skip this step" link on the registration page to skip it.
 
-[Setup/migration guide for employees](https://github.com/odoo/odoo/blob/master/doc/git.rst)
 
+Getting started with Odoo developement
+--------------------------------------
 
-Migration from bazaar
-=====================
+If you are a developer type the following command at your terminal [1]:
 
-If you have existing bazaar branches and want to move them to a git repository,
-there are several options:
+    wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
 
-* download http://nightly.openerp.com/move-branch.zip and run it with
-  `python move-branch.zip -h` (for the help). It should be able to convert
-  simple-enough branches for you (even if they have merge commits &al)
-* Extract the branch contents as patches and use `git apply` or `git am` to
-  rebuild a branch from them
-* Replay the branch by hand
+Then follow <a href="https://doc.openerp.com/trunk/server/howto/howto_website/">the developer tutorial</a>
 
+[1] You may want to check the content of the <a href="https://raw.githubusercontent.com/odoo/odoo/master/odoo.py">odoo.py file</a> before executing it.
 
-System Requirements
--------------------
 
-The dependencies are listed in setup.py
+Packages, tarballs and installers
+---------------------------------
 
+* Debian packages
 
-Debian/Ubuntu
--------------
+    Add this apt repository to your /etc/apt/sources.list file
 
-Add the apt repository
+        deb http://nightly.openerp.com/8.0/deb/ ./
 
-    deb http://nightly.openerp.com/7.0/deb/ ./
+    Then type:
 
-in your source.list and type:
+        $ sudo apt-get update
+        $ sudo apt-get install odoo
 
-    $ sudo apt-get update
-    $ sudo apt-get install openerp
+* <a href="http://nightly.openerp.com/">Source tarballs</a>
 
-Or download the deb file and type:
+* <a href="http://nightly.openerp.com/">Windows installer</a>
 
-    $ sudo dpkg -i <openerp-deb-filename>
-    $ sudo apt-get install -f
+* <a href="http://nightly.openerp.com/">RPM package</a>
 
-RedHat, Fedora, CentOS
-----------------------
 
-Install the required dependencies:
+For Odoo employees
+------------------
 
-    $ yum install python
-    $ easy_install pip
-    $ pip install .....
+To add the odoo-dev remote use this command:
 
-Install the openerp rpm
+    $ ./odoo.py setup_git_dev
 
-    $ rpm -i openerp-VERSION.rpm
+To fetch odoo merge pull requests refs use this command:
 
-Windows
--------
-
-Check the notes in setup.py
-
-
-Setting up your database
-------------------------
-
-Point your browser to http://localhost:8069/ and click "Manage Databases", the
-default master password is "admin".
+    $ ./odoo.py setup_git_review
 

addons/account/__openerp__.py

@@ -65,6 +65,7 @@
         'wizard/account_period_close_view.xml',
         'wizard/account_reconcile_view.xml',
         'wizard/account_unreconcile_view.xml',
+        'wizard/account_statement_from_invoice_view.xml',
         'account_view.xml',
         'account_report.xml',
         'account_financial_report_data.xml',
@@ -144,13 +145,15 @@
     'qweb' : [
         "static/src/xml/account_move_reconciliation.xml",
         "static/src/xml/account_move_line_quickadd.xml",
+        "static/src/xml/account_bank_statement_reconciliation.xml",
     ],
     'demo': [
         'demo/account_demo.xml',
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'demo/account_invoice_demo.xml',
+        'demo/account_bank_statement.xml',
         'account_unit_test.xml',
     ],
     'test': [

addons/account/account.py

@@ -2082,6 +2082,11 @@ def _unit_compute(self, cr, uid, taxes, price_unit, product=None, partner=None,
                 cur_price_unit+=amount2
         return res
 
+    def compute_for_bank_reconciliation(self, cr, uid, tax_id, amount, context=None):
+        """ Called by RPC by the bank statement reconciliation widget """
+        tax = self.browse(cr, uid, tax_id, context=context)
+        return self.compute_all(cr, uid, [tax], amount, 1) # TOCHECK may use force_exclude parameter
+
     def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):
         """
         :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of